← Back to branch summary

~saiarcot895/chromium-browser/chromium-browser.precise.dev

« back to all changes in this revision

Viewing changes to debian/patches/wayland-0008-Add-file-picker-support-using-WebUI.patch

  • Committer: Saikrishna Arcot
  • Date: 2015-11-25 13:38:45 UTC
  • Revision ID: saikrishna@saikrishna-vps-20151125133845-8gccfjmqh5eebasu
Tags: 48.0.2564.10-0ubuntu1~ppa1~12.04.1
* New upstream version 48.0.2564.10
* Updated patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/wayland-0008-Add-file-picker-support-using-WebUI.patch
36
36
===================================================================
37
37
--- dev.wily.orig/chrome/app/generated_resources.grd
38
38
+++ dev.wily/chrome/app/generated_resources.grd
39
 
@@ -15161,6 +15161,14 @@ Please check your email at <ph name="ACC
 
39
@@ -15215,6 +15215,14 @@ Please check your email at <ph name="ACC
40
40
         Allows users to opt in to the collection of invalid TLS/SSL certificate chains.
41
41
       </message>
42
42
 
55
55
===================================================================
56
56
--- dev.wily.orig/chrome/browser/browser_resources.grd
57
57
+++ dev.wily/chrome/browser/browser_resources.grd
58
 
@@ -465,6 +465,9 @@
 
58
@@ -469,6 +469,9 @@
59
59
       <if expr="enable_media_router">
60
60
         <part file="media_router_resources.grdp" />
61
61
       </if>
279
279
===================================================================
280
280
--- dev.wily.orig/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
281
281
+++ dev.wily/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
282
 
@@ -75,6 +75,7 @@
 
282
@@ -77,6 +77,7 @@
283
283
 #include "ui/gfx/favicon_size.h"
284
284
 #include "ui/web_dialogs/web_dialog_ui.h"
285
285
 #include "url/gurl.h"
287
287
 
288
288
 #if !defined(DISABLE_NACL)
289
289
 #include "chrome/browser/ui/webui/nacl_ui.h"
290
 
@@ -334,6 +335,8 @@ WebUIFactoryFunction GetWebUIFactoryFunc
 
290
@@ -336,6 +337,8 @@ WebUIFactoryFunction GetWebUIFactoryFunc
291
291
     return &NewWebUI<DomainReliabilityInternalsUI>;
292
292
   if (url.host() == chrome::kChromeUIFlagsHost)
293
293
     return &NewWebUI<FlagsUI>;
559
559
       'browser/ui/webui/flags_ui.cc',
560
560
       'browser/ui/webui/flags_ui.h',
561
561
       'browser/ui/webui/gcm_internals_ui.cc',
562
 
@@ -2795,6 +2798,7 @@
 
562
@@ -2816,6 +2819,7 @@
563
563
         '../content/content.gyp:content_browser',
564
564
         '../content/content.gyp:content_common',
565
565
         '../crypto/crypto.gyp:crypto',
567
567
         '../skia/skia.gyp:skia',
568
568
         '../sync/sync.gyp:sync',
569
569
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
570
 
@@ -3161,6 +3165,7 @@
 
570
@@ -3184,6 +3188,7 @@
571
571
               'dependencies': [
572
572
                 '../build/linux/system.gyp:dbus',
573
573
                 '../build/linux/system.gyp:fontconfig',