← Back to branch summary

~saiarcot895/chromium-browser/chromium-browser.utopic.beta

« back to all changes in this revision

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

  • Committer: Saikrishna Arcot
  • Date: 2015-06-25 03:38:51 UTC
  • Revision ID: saiarcot895@gmail.com-20150625033851-jacp4ttjapr9qbtt
Tags: 44.0.2403.61-0ubuntu1~ppa1~utopic1
* New upstream version 44.0.2403.61
* Refreshed and updated patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/5-desktop-integration-settings.patch
1
1
Index: beta.vivid/chrome/app/generated_resources.grd
2
2
===================================================================
3
 
--- beta.vivid.orig/chrome/app/generated_resources.grd  2015-06-05 11:27:53.053304951 -0400
4
 
+++ beta.vivid/chrome/app/generated_resources.grd       2015-06-05 11:27:53.035305187 -0400
 
3
--- beta.vivid.orig/chrome/app/generated_resources.grd  2015-06-24 23:38:18.355549268 -0400
 
4
+++ beta.vivid/chrome/app/generated_resources.grd       2015-06-24 23:38:18.345549416 -0400
5
5
@@ -8158,6 +8158,35 @@
6
6
         Reload
7
7
       </message>
50
50
       </message>
51
51
Index: beta.vivid/chrome/browser/resources/options/browser_options.html
52
52
===================================================================
53
 
--- beta.vivid.orig/chrome/browser/resources/options/browser_options.html       2015-06-05 11:27:53.053304951 -0400
54
 
+++ beta.vivid/chrome/browser/resources/options/browser_options.html    2015-06-05 11:27:53.036305174 -0400
 
53
--- beta.vivid.orig/chrome/browser/resources/options/browser_options.html       2015-06-24 23:38:18.355549268 -0400
 
54
+++ beta.vivid/chrome/browser/resources/options/browser_options.html    2015-06-24 23:38:18.346549401 -0400
55
55
@@ -549,6 +549,20 @@
56
56
     </div>
57
57
   </section>
75
75
     <div class="checkbox controlled-setting-with-label">
76
76
Index: beta.vivid/chrome/browser/resources/options/browser_options.js
77
77
===================================================================
78
 
--- beta.vivid.orig/chrome/browser/resources/options/browser_options.js 2015-06-05 11:27:53.053304951 -0400
79
 
+++ beta.vivid/chrome/browser/resources/options/browser_options.js      2015-06-05 11:27:53.038305148 -0400
 
78
--- beta.vivid.orig/chrome/browser/resources/options/browser_options.js 2015-06-24 23:38:18.355549268 -0400
 
79
+++ beta.vivid/chrome/browser/resources/options/browser_options.js      2015-06-24 23:38:18.346549401 -0400
80
80
@@ -618,6 +618,23 @@
81
81
             [String(event.target.options[event.target.selectedIndex].value)]);
82
82
       };
145
145
Index: beta.vivid/chrome/browser/resources/options/desktop_integration_add_website_overlay.html
146
146
===================================================================
147
147
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
148
 
+++ beta.vivid/chrome/browser/resources/options/desktop_integration_add_website_overlay.html    2015-06-05 11:27:53.038305148 -0400
 
148
+++ beta.vivid/chrome/browser/resources/options/desktop_integration_add_website_overlay.html    2015-06-24 23:38:18.346549401 -0400
149
149
@@ -0,0 +1,15 @@
150
150
+<div id="add-desktop-integration-website-overlay-page" class="page" hidden>
151
151
+  <div class="close-button"></div>
165
165
Index: beta.vivid/chrome/browser/resources/options/desktop_integration_add_website_overlay.js
166
166
===================================================================
167
167
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
168
 
+++ beta.vivid/chrome/browser/resources/options/desktop_integration_add_website_overlay.js      2015-06-05 11:27:53.038305148 -0400
 
168
+++ beta.vivid/chrome/browser/resources/options/desktop_integration_add_website_overlay.js      2015-06-24 23:38:18.347549387 -0400
169
169
@@ -0,0 +1,48 @@
170
170
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
171
171
+// Use of this source code is governed by a BSD-style license that can be
218
218
Index: beta.vivid/chrome/browser/resources/options/desktop_integration_overlay.css
219
219
===================================================================
220
220
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
221
 
+++ beta.vivid/chrome/browser/resources/options/desktop_integration_overlay.css 2015-06-05 11:27:53.038305148 -0400
 
221
+++ beta.vivid/chrome/browser/resources/options/desktop_integration_overlay.css 2015-06-24 23:38:18.347549387 -0400
222
222
@@ -0,0 +1,75 @@
223
223
+/* Copyright (c) 2012 The Chromium Authors. All rights reserved.
224
224
+ * Use of this source code is governed by a BSD-style license that can be
298
298
Index: beta.vivid/chrome/browser/resources/options/desktop_integration_overlay.html
299
299
===================================================================
300
300
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
301
 
+++ beta.vivid/chrome/browser/resources/options/desktop_integration_overlay.html        2015-06-05 11:27:53.038305148 -0400
 
301
+++ beta.vivid/chrome/browser/resources/options/desktop_integration_overlay.html        2015-06-24 23:38:18.347549387 -0400
302
302
@@ -0,0 +1,26 @@
303
303
+<div id="desktop-integration-area" class="page" hidden>
304
304
+
329
329
Index: beta.vivid/chrome/browser/resources/options/desktop_integration_overlay.js
330
330
===================================================================
331
331
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
332
 
+++ beta.vivid/chrome/browser/resources/options/desktop_integration_overlay.js  2015-06-05 11:27:53.038305148 -0400
 
332
+++ beta.vivid/chrome/browser/resources/options/desktop_integration_overlay.js  2015-06-24 23:38:18.348549373 -0400
333
333
@@ -0,0 +1,207 @@
334
334
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
335
335
+// Use of this source code is governed by a BSD-style license that can be
540
540
+
541
541
Index: beta.vivid/chrome/browser/resources/options/options.html
542
542
===================================================================
543
 
--- beta.vivid.orig/chrome/browser/resources/options/options.html       2015-06-05 11:27:53.053304951 -0400
544
 
+++ beta.vivid/chrome/browser/resources/options/options.html    2015-06-05 11:27:53.039305135 -0400
 
543
--- beta.vivid.orig/chrome/browser/resources/options/options.html       2015-06-24 23:38:18.355549268 -0400
 
544
+++ beta.vivid/chrome/browser/resources/options/options.html    2015-06-24 23:38:18.348549373 -0400
545
545
@@ -24,6 +24,7 @@
546
546
 <link rel="stylesheet" href="clear_browser_data_overlay.css">
547
547
 <link rel="stylesheet" href="content_settings.css">
568
568
   <include src="supervised_user_import.html">
569
569
Index: beta.vivid/chrome/browser/resources/options/options.js
570
570
===================================================================
571
 
--- beta.vivid.orig/chrome/browser/resources/options/options.js 2015-06-05 11:27:53.053304951 -0400
572
 
+++ beta.vivid/chrome/browser/resources/options/options.js      2015-06-05 11:27:53.039305135 -0400
 
571
--- beta.vivid.orig/chrome/browser/resources/options/options.js 2015-06-24 23:38:18.355549268 -0400
 
572
+++ beta.vivid/chrome/browser/resources/options/options.js      2015-06-24 23:38:18.348549373 -0400
573
573
@@ -15,6 +15,8 @@
574
574
     options.contentSettings.ContentSettingsExceptionsArea;
575
575
 var ContentSettings = options.ContentSettings;
599
599
                                 ContentSettings.getInstance(),
600
600
Index: beta.vivid/chrome/browser/resources/options/options_bundle.js
601
601
===================================================================
602
 
--- beta.vivid.orig/chrome/browser/resources/options/options_bundle.js  2015-06-05 11:27:53.053304951 -0400
603
 
+++ beta.vivid/chrome/browser/resources/options/options_bundle.js       2015-06-05 11:27:53.039305135 -0400
 
602
--- beta.vivid.orig/chrome/browser/resources/options/options_bundle.js  2015-06-24 23:38:18.355549268 -0400
 
603
+++ beta.vivid/chrome/browser/resources/options/options_bundle.js       2015-06-24 23:38:18.348549373 -0400
604
604
@@ -82,6 +82,8 @@
605
605
 <include src="content_settings_ui.js">
606
606
 <include src="cookies_list.js">
612
612
 <include src="font_settings.js">
613
613
Index: beta.vivid/chrome/browser/ui/webui/options/browser_options_handler.cc
614
614
===================================================================
615
 
--- beta.vivid.orig/chrome/browser/ui/webui/options/browser_options_handler.cc  2015-06-05 11:27:53.053304951 -0400
616
 
+++ beta.vivid/chrome/browser/ui/webui/options/browser_options_handler.cc       2015-06-05 11:27:53.042305096 -0400
 
615
--- beta.vivid.orig/chrome/browser/ui/webui/options/browser_options_handler.cc  2015-06-24 23:38:18.355549268 -0400
 
616
+++ beta.vivid/chrome/browser/ui/webui/options/browser_options_handler.cc       2015-06-24 23:38:18.350549343 -0400
617
617
@@ -220,6 +220,8 @@
618
618
     { "advancedSectionTitleCloudPrint", IDS_GOOGLE_CLOUD_PRINT },
619
619
     { "advancedSectionTitleContent",
634
634
     { "disableWebServices", IDS_OPTIONS_DISABLE_WEB_SERVICES },
635
635
     { "doNotTrack", IDS_OPTIONS_ENABLE_DO_NOT_TRACK },
636
636
     { "doNotTrackConfirmDisable",
637
 
@@ -329,6 +335,8 @@
 
637
@@ -330,6 +336,8 @@
638
638
       IDS_PRODUCT_NAME },
639
639
     { "profilesSupervisedDashboardTip",
640
640
       IDS_PROFILES_SUPERVISED_USER_DASHBOARD_TIP },
646
646
Index: beta.vivid/chrome/browser/ui/webui/options/desktop_integration_settings_handler.cc
647
647
===================================================================
648
648
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
649
 
+++ beta.vivid/chrome/browser/ui/webui/options/desktop_integration_settings_handler.cc  2015-06-05 11:27:53.046305044 -0400
 
649
+++ beta.vivid/chrome/browser/ui/webui/options/desktop_integration_settings_handler.cc  2015-06-24 23:38:18.351549328 -0400
650
650
@@ -0,0 +1,262 @@
651
651
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
652
652
+// Use of this source code is governed by a BSD-style license that can be
913
913
Index: beta.vivid/chrome/browser/ui/webui/options/desktop_integration_settings_handler.h
914
914
===================================================================
915
915
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
916
 
+++ beta.vivid/chrome/browser/ui/webui/options/desktop_integration_settings_handler.h   2015-06-05 11:27:53.046305044 -0400
 
916
+++ beta.vivid/chrome/browser/ui/webui/options/desktop_integration_settings_handler.h   2015-06-24 23:38:18.351549328 -0400
917
917
@@ -0,0 +1,76 @@
918
918
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
919
919
+// Use of this source code is governed by a BSD-style license that can be
993
993
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_DESKTOP_INTEGRATION_SETTINGS_HANDLER2_H_
994
994
Index: beta.vivid/chrome/browser/ui/webui/options/options_ui.cc
995
995
===================================================================
996
 
--- beta.vivid.orig/chrome/browser/ui/webui/options/options_ui.cc       2015-06-05 11:27:53.053304951 -0400
997
 
+++ beta.vivid/chrome/browser/ui/webui/options/options_ui.cc    2015-06-05 11:27:53.046305044 -0400
 
996
--- beta.vivid.orig/chrome/browser/ui/webui/options/options_ui.cc       2015-06-24 23:38:18.355549268 -0400
 
997
+++ beta.vivid/chrome/browser/ui/webui/options/options_ui.cc    2015-06-24 23:38:18.351549328 -0400
998
998
@@ -105,6 +105,10 @@
999
999
 #include "chrome/browser/ui/webui/options/geolocation_options_handler.h"
1000
1000
 #endif
1017
1017
   AddOptionsPageUIHandler(localized_strings, new GeolocationOptionsHandler());
1018
1018
Index: beta.vivid/chrome/chrome_browser_ui.gypi
1019
1019
===================================================================
1020
 
--- beta.vivid.orig/chrome/chrome_browser_ui.gypi       2015-06-05 11:27:53.053304951 -0400
1021
 
+++ beta.vivid/chrome/chrome_browser_ui.gypi    2015-06-05 11:27:53.049305003 -0400
 
1020
--- beta.vivid.orig/chrome/chrome_browser_ui.gypi       2015-06-24 23:38:18.355549268 -0400
 
1021
+++ beta.vivid/chrome/chrome_browser_ui.gypi    2015-06-24 23:38:18.353549298 -0400
1022
1022
@@ -1851,6 +1851,8 @@
1023
1023
       'browser/ui/webui/options/core_options_handler.h',
1024
1024
       'browser/ui/webui/options/create_profile_handler.cc',