← 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: 2014-02-21 00:14:13 UTC
  • Revision ID: chad.miller@canonical.com-20140221001413-xeloyqxq52xndv72
* Upstream release 33.0.1750.115.
* debian/rules, debian/control: Switch to using ninja instead of make to
  build. Switch from CDBS to dh. Remove many old hacks.
* debian/patches/disable_gn.patch: disable broken GN before build. Temporary
  hack.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/5-desktop-integration-settings.patch
1
1
--- a/src/chrome/app/generated_resources.grd
2
2
+++ b/src/chrome/app/generated_resources.grd
3
 
@@ -12072,6 +12072,9 @@
 
3
@@ -11908,6 +11908,9 @@
4
4
       <message name="IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT">
5
5
         Web content
6
6
       </message>
10
10
       <message name="IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY">
11
11
         HTTPS/SSL
12
12
       </message>
13
 
@@ -14844,6 +14847,35 @@
 
13
@@ -14466,6 +14469,35 @@
14
14
       </message>
15
15
     </if>
16
16
 
48
48
       Edit user
49
49
--- a/src/chrome/browser/resources/options/browser_options.html
50
50
+++ b/src/chrome/browser/resources/options/browser_options.html
51
 
@@ -381,6 +381,22 @@
 
51
@@ -382,6 +382,22 @@
52
52
     </div>
53
53
   </section>
54
54
 </if>  <!-- pp_ifdef('chromeos') -->
73
73
     <div class="checkbox">
74
74
--- a/src/chrome/browser/resources/options/browser_options.js
75
75
+++ b/src/chrome/browser/resources/options/browser_options.js
76
 
@@ -367,6 +367,23 @@
 
76
@@ -357,6 +357,23 @@
77
77
             [String(event.target.options[event.target.selectedIndex].value)]);
78
78
       };
79
79
 
97
97
       // Languages section.
98
98
       var showLanguageOptions = function(event) {
99
99
         OptionsPage.navigateToPage('languages');
100
 
@@ -1213,6 +1230,24 @@
 
100
@@ -1247,6 +1264,24 @@
101
101
     },
102
102
 
103
103
     /**
122
122
      * Set the checked state of the metrics reporting checkbox.
123
123
      * @private
124
124
      */
125
 
@@ -1514,6 +1549,7 @@
 
125
@@ -1556,6 +1591,7 @@
126
126
   //Forward public APIs to private implementations.
127
127
   [
128
128
     'addBluetoothDevice',
130
130
     'enableCertificateButton',
131
131
     'enableFactoryResetSection',
132
132
     'getCurrentProfile',
133
 
@@ -1528,6 +1564,7 @@
 
133
@@ -1571,6 +1607,7 @@
134
134
     'setFontSize',
135
135
     'setNativeThemeButtonEnabled',
136
136
     'setHighContrastCheckboxState',
518
518
+
519
519
--- a/src/chrome/browser/resources/options/options.html
520
520
+++ b/src/chrome/browser/resources/options/options.html
521
 
@@ -23,6 +23,7 @@
522
 
 <link rel="stylesheet" href="clear_browser_data_overlay.css">
 
521
@@ -24,6 +24,7 @@
523
522
 <link rel="stylesheet" href="content_settings.css">
 
523
 <link rel="stylesheet" href="controlled_setting.css">
524
524
 <link rel="stylesheet" href="cookies_view.css">
525
525
+<link rel="stylesheet" href="desktop_integration_overlay.css">
526
526
 <link rel="stylesheet" href="do_not_track_confirm_overlay.css">
527
527
 <link rel="stylesheet" href="font_settings.css">
528
528
 <link rel="stylesheet" href="handler_options.css">
529
 
@@ -106,6 +107,7 @@
 
529
@@ -108,6 +109,7 @@
530
530
   <include src="font_settings.html">
531
531
   <include src="home_page_overlay.html">
532
532
   <include src="import_data_overlay.html">
534
534
   <include src="language_options.html">
535
535
   <include src="manage_profile_overlay.html">
536
536
   <include src="managed_user_create_confirm.html">
537
 
@@ -136,6 +138,7 @@
 
537
@@ -138,6 +140,7 @@
538
538
   <include src="autofill_edit_creditcard_overlay.html">
539
539
   <include src="content_settings_exceptions_area.html">
540
540
   <include src="cookies_view.html">
580
580
 <if expr="pp_ifdef('enable_google_now')">
581
581
--- a/src/chrome/browser/ui/webui/options/browser_options_handler.cc
582
582
+++ b/src/chrome/browser/ui/webui/options/browser_options_handler.cc
583
 
@@ -195,6 +195,8 @@
 
583
@@ -203,6 +203,8 @@
584
584
     { "currentUserOnly", IDS_OPTIONS_CURRENT_USER_ONLY },
585
585
     { "advancedSectionTitleContent",
586
586
       IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT },
589
589
     { "advancedSectionTitleLanguages",
590
590
       IDS_OPTIONS_ADVANCED_SECTION_TITLE_LANGUAGES },
591
591
     { "advancedSectionTitleNetwork",
592
 
@@ -214,6 +216,10 @@
 
592
@@ -222,6 +224,10 @@
593
593
     { "defaultFontSizeLabel", IDS_OPTIONS_DEFAULT_FONT_SIZE_LABEL },
594
594
     { "defaultSearchManageEngines", IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES },
595
595
     { "defaultZoomFactorLabel", IDS_OPTIONS_DEFAULT_ZOOM_LEVEL_LABEL },
600
600
 #if defined(OS_CHROMEOS)
601
601
     { "disableGData", IDS_OPTIONS_DISABLE_GDATA },
602
602
 #endif
603
 
@@ -277,6 +283,8 @@
 
603
@@ -285,6 +291,8 @@
604
604
 #if defined(ENABLE_SETTINGS_APP)
605
605
     { "profilesAppListSwitch", IDS_SETTINGS_APP_PROFILES_SWITCH_BUTTON_LABEL },
606
606
 #endif
954
954
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_DESKTOP_INTEGRATION_SETTINGS_HANDLER2_H_
955
955
--- a/src/chrome/browser/ui/webui/options/options_ui.cc
956
956
+++ b/src/chrome/browser/ui/webui/options/options_ui.cc
957
 
@@ -92,6 +92,10 @@
 
957
@@ -93,6 +93,10 @@
958
958
 #include "chrome/browser/ui/webui/options/geolocation_options_handler.h"
959
959
 #endif
960
960
 
965
965
 using content::RenderViewHost;
966
966
 
967
967
 namespace {
968
 
@@ -260,6 +264,10 @@
 
968
@@ -261,6 +265,10 @@
969
969
   AddOptionsPageUIHandler(localized_strings, new ClearBrowserDataHandler());
970
970
   AddOptionsPageUIHandler(localized_strings, new ContentSettingsHandler());
971
971
   AddOptionsPageUIHandler(localized_strings, new CookiesViewHandler());
978
978
 #if defined(ENABLE_GOOGLE_NOW)
979
979
--- a/src/chrome/chrome_browser_ui.gypi
980
980
+++ b/src/chrome/chrome_browser_ui.gypi
981
 
@@ -2382,6 +2382,8 @@
 
981
@@ -2458,6 +2458,8 @@
982
982
         'browser/ui/webui/options/cookies_view_handler.h',
983
983
         'browser/ui/webui/options/core_options_handler.cc',
984
984
         'browser/ui/webui/options/core_options_handler.h',