← Back to branch summary

~chromium-team/chromium-browser/artful-beta

« back to all changes in this revision

Viewing changes to debian/patches/5-desktop-integration-settings.patch

  • Committer: Chad MILLER
  • Date: 2015-04-17 00:17:26 UTC
  • Revision ID: chad.miller@canonical.com-20150417001726-dszj422xuq86ob42
* Upstream release 42.0.2311.90:
  - CVE-2015-1235: Cross-origin-bypass in HTML parser.
  - CVE-2015-1236: Cross-origin-bypass in Blink.
  - CVE-2015-1237: Use-after-free in IPC.
  - CVE-2015-1238: Out-of-bounds write in Skia.
  - CVE-2015-1240: Out-of-bounds read in WebGL.
  - CVE-2015-1241: Tap-Jacking.
  - CVE-2015-1242: Type confusion in V8.
  - CVE-2015-1244: HSTS bypass in WebSockets.
  - CVE-2015-1245: Use-after-free in PDFium.
  - CVE-2015-1247: Scheme issues in OpenSearch.
  - CVE-2015-1248: SafeBrowsing bypass.
* Upstream release 41.0.2272.118:
  - CVE-2015-1233: A special thanks to Anonymous for a combination of V8,
    Gamepad and IPC bugs that can lead to remote code execution outside of
    the sandbox. 
  - CVE-2015-1234: Buffer overflow via race condition in GPU.
* debian/chromium-browser-etc-customizations-flash-staleness: Ask sudo users
  to update flash player.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/5-desktop-integration-settings.patch
1
1
--- a/chrome/app/generated_resources.grd
2
2
+++ b/chrome/app/generated_resources.grd
3
 
@@ -5177,6 +5177,35 @@ Keep your key file in a safe place. You
 
3
@@ -5207,6 +5207,35 @@ Keep your key file in a safe place. You
4
4
         Hide Details
5
5
       </message>
6
6
 
36
36
       <!-- Strings for the extensions permission dialog experiment -->
37
37
       <!-- TODO(meacer): Remove these once the experiments are completed. -->
38
38
       <message name="IDS_EXTENSION_PROMPT_EXPERIMENT_EXPLANATION1">
39
 
@@ -12193,6 +12222,9 @@ Some features may be unavailable.  Pleas
 
39
@@ -12323,6 +12352,9 @@ Some features may be unavailable.  Pleas
40
40
       <message name="IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT">
41
41
         Web content
42
42
       </message>
48
48
       </message>
49
49
--- a/chrome/browser/resources/options/browser_options.html
50
50
+++ b/chrome/browser/resources/options/browser_options.html
51
 
@@ -528,6 +528,20 @@
 
51
@@ -554,6 +554,20 @@
52
52
     </div>
53
53
   </section>
54
54
 </if>  <!-- chromeos -->
71
71
     <div class="checkbox controlled-setting-with-label">
72
72
--- a/chrome/browser/resources/options/browser_options.js
73
73
+++ b/chrome/browser/resources/options/browser_options.js
74
 
@@ -589,6 +589,23 @@ cr.define('options', function() {
 
74
@@ -618,6 +618,23 @@ cr.define('options', function() {
75
75
             [String(event.target.options[event.target.selectedIndex].value)]);
76
76
       };
77
77
 
95
95
       // Languages section.
96
96
       var showLanguageOptions = function(event) {
97
97
         PageManager.showPageByName('languages');
98
 
@@ -1648,6 +1665,24 @@ cr.define('options', function() {
 
98
@@ -1713,6 +1730,24 @@ cr.define('options', function() {
99
99
     },
100
100
 
101
101
     /**
120
120
      * Set the checked state of the metrics reporting checkbox.
121
121
      * @private
122
122
      */
123
 
@@ -2103,6 +2138,7 @@ cr.define('options', function() {
 
123
@@ -2167,6 +2202,7 @@ cr.define('options', function() {
124
124
   cr.makePublic(BrowserOptions, [
125
125
     'addBluetoothDevice',
126
126
     'deleteCurrentProfile',
128
128
     'enableCertificateButton',
129
129
     'enableDisplayButton',
130
130
     'enableFactoryResetSection',
131
 
@@ -2119,6 +2155,7 @@ cr.define('options', function() {
 
131
@@ -2183,6 +2219,7 @@ cr.define('options', function() {
132
132
     'setBatteryStatusText',
133
133
     'setBluetoothState',
134
134
     'setCanSetTime',
590
590
 <include src="font_settings.js">
591
591
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
592
592
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
593
 
@@ -224,6 +224,8 @@ void BrowserOptionsHandler::GetLocalized
594
 
       IDS_OPTIONS_ADVANCED_SECTION_TITLE_CERTIFICATES },
 
593
@@ -219,6 +219,8 @@ void BrowserOptionsHandler::GetLocalized
 
594
     { "advancedSectionTitleCloudPrint", IDS_GOOGLE_CLOUD_PRINT },
595
595
     { "advancedSectionTitleContent",
596
596
       IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT },
597
597
+    { "advancedSectionTitleIntegration",
599
599
     { "advancedSectionTitleLanguages",
600
600
       IDS_OPTIONS_ADVANCED_SECTION_TITLE_LANGUAGES },
601
601
     { "advancedSectionTitleNetwork",
602
 
@@ -242,6 +244,10 @@ void BrowserOptionsHandler::GetLocalized
 
602
@@ -243,6 +245,8 @@ void BrowserOptionsHandler::GetLocalized
603
603
     { "defaultFontSizeLabel", IDS_OPTIONS_DEFAULT_FONT_SIZE_LABEL },
604
604
     { "defaultSearchManageEngines", IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES },
605
605
     { "defaultZoomFactorLabel", IDS_OPTIONS_DEFAULT_ZOOM_LEVEL_LABEL },
606
 
+    { "desktopIntegrationExceptionsSettingsButton",
607
 
+      IDS_DESKTOP_INTEGRATION_SETTINGS_EXCEPTIONS_BUTTON_LABEL },
608
 
+    { "desktopIntegrationNoteSettingsContent",
609
 
+      IDS_DESKTOP_INTEGRATION_NOTE_DESCRIPTION },
610
 
 #if defined(OS_CHROMEOS)
611
 
     { "disableGData", IDS_OPTIONS_DISABLE_GDATA },
612
 
 #endif
613
 
@@ -325,6 +331,8 @@ void BrowserOptionsHandler::GetLocalized
614
 
     { "profilesManage", IDS_PROFILES_MANAGE_BUTTON_LABEL },
 
606
+    { "desktopIntegrationExceptionsSettingsButton", IDS_DESKTOP_INTEGRATION_SETTINGS_EXCEPTIONS_BUTTON_LABEL },
 
607
+    { "desktopIntegrationNoteSettingsContent", IDS_DESKTOP_INTEGRATION_NOTE_DESCRIPTION },
 
608
     { "disableWebServices", IDS_OPTIONS_DISABLE_WEB_SERVICES },
 
609
     { "doNotTrack", IDS_OPTIONS_ENABLE_DO_NOT_TRACK },
 
610
     { "doNotTrackConfirmDisable",
 
611
@@ -324,6 +328,7 @@ void BrowserOptionsHandler::GetLocalized
 
612
       IDS_PRODUCT_NAME },
615
613
     { "profilesSupervisedDashboardTip",
616
614
       IDS_PROFILES_SUPERVISED_USER_DASHBOARD_TIP },
617
 
+    { "promptIntegrationEnableIntegration",
618
 
+      IDS_PROMPT_INTEGRATION_ENABLE_BUTTON_LABEL },
619
 
 #if defined(ENABLE_SETTINGS_APP)
620
 
     { "profilesAppListSwitch", IDS_SETTINGS_APP_PROFILES_SWITCH_BUTTON_LABEL },
621
 
 #endif
 
615
+    { "promptIntegrationEnableIntegration", IDS_PROMPT_INTEGRATION_ENABLE_BUTTON_LABEL },
 
616
     { "proxiesLabelExtension", IDS_OPTIONS_EXTENSION_PROXIES_LABEL },
 
617
     { "proxiesLabelSystem", IDS_OPTIONS_SYSTEM_PROXIES_LABEL,
 
618
       IDS_PRODUCT_NAME },
622
619
--- /dev/null
623
620
+++ b/chrome/browser/ui/webui/options/desktop_integration_settings_handler.cc
624
621
@@ -0,0 +1,273 @@
976
973
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_DESKTOP_INTEGRATION_SETTINGS_HANDLER2_H_
977
974
--- a/chrome/browser/ui/webui/options/options_ui.cc
978
975
+++ b/chrome/browser/ui/webui/options/options_ui.cc
979
 
@@ -110,6 +110,10 @@
 
976
@@ -107,6 +107,10 @@
980
977
 #include "chrome/browser/ui/webui/options/geolocation_options_handler.h"
981
978
 #endif
982
979
 
987
984
 using content::RenderViewHost;
988
985
 
989
986
 namespace {
990
 
@@ -283,6 +287,8 @@ OptionsUI::OptionsUI(content::WebUI* web
 
987
@@ -281,6 +285,8 @@ OptionsUI::OptionsUI(content::WebUI* web
991
988
   AddOptionsPageUIHandler(localized_strings, new CookiesViewHandler());
992
989
   AddOptionsPageUIHandler(localized_strings, new CreateProfileHandler());
993
990
   AddOptionsPageUIHandler(localized_strings, new EasyUnlockHandler());
998
995
   AddOptionsPageUIHandler(localized_strings, new GeolocationOptionsHandler());
999
996
--- a/chrome/chrome_browser_ui.gypi
1000
997
+++ b/chrome/chrome_browser_ui.gypi
1001
 
@@ -1729,6 +1729,8 @@
 
998
@@ -1739,6 +1739,8 @@
1002
999
       'browser/ui/webui/options/core_options_handler.h',
1003
1000
       'browser/ui/webui/options/create_profile_handler.cc',
1004
1001
       'browser/ui/webui/options/create_profile_handler.h',
1007
1004
       'browser/ui/webui/options/easy_unlock_handler.cc',
1008
1005
       'browser/ui/webui/options/easy_unlock_handler.h',
1009
1006
       'browser/ui/webui/options/font_settings_handler.cc',
1010
 
@@ -2892,6 +2894,7 @@
 
1007
@@ -2876,6 +2878,7 @@
1011
1008
           ],
1012
1009
         }],
1013
1010
         ['use_aura==1 and chromeos==0 and use_ozone==0 and OS=="linux"', {