← Back to branch summary

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

« back to all changes in this revision

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

  • Committer: Saikrishna Arcot
  • Date: 2014-03-15 12:34:23 UTC
  • Revision ID: saiarcot895@gmail.com-20140315123423-gc15qxfqli956riq
Tags: 34.0.1847.60-0ubuntu1~ppa1~quantal1
* New upstream version 34.0.1847.60
* Refreshed patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/5-desktop-integration-settings.patch
1
1
Index: beta.trusty/src/chrome/app/generated_resources.grd
2
2
===================================================================
3
 
--- beta.trusty.orig/src/chrome/app/generated_resources.grd     2014-03-07 17:27:45.371931046 -0500
4
 
+++ beta.trusty/src/chrome/app/generated_resources.grd  2014-03-07 17:27:45.095920936 -0500
 
3
--- beta.trusty.orig/src/chrome/app/generated_resources.grd     2014-03-15 07:23:44.147040686 -0500
 
4
+++ beta.trusty/src/chrome/app/generated_resources.grd  2014-03-15 07:23:44.015041343 -0500
5
5
@@ -12257,6 +12257,9 @@
6
6
       <message name="IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT">
7
7
         Web content
50
50
       <!-- Manage Profile Dialog -->
51
51
Index: beta.trusty/src/chrome/browser/resources/options/options.html
52
52
===================================================================
53
 
--- beta.trusty.orig/src/chrome/browser/resources/options/options.html  2014-03-07 17:27:45.371931046 -0500
54
 
+++ beta.trusty/src/chrome/browser/resources/options/options.html       2014-03-07 17:27:45.199924746 -0500
 
53
--- beta.trusty.orig/src/chrome/browser/resources/options/options.html  2014-03-15 07:23:44.147040686 -0500
 
54
+++ beta.trusty/src/chrome/browser/resources/options/options.html       2014-03-15 07:23:44.031041264 -0500
55
55
@@ -24,6 +24,7 @@
56
56
 <link rel="stylesheet" href="content_settings.css">
57
57
 <link rel="stylesheet" href="controlled_setting.css">
78
78
   <include src="managed_user_learn_more.html">
79
79
Index: beta.trusty/src/chrome/browser/resources/options/browser_options.js
80
80
===================================================================
81
 
--- beta.trusty.orig/src/chrome/browser/resources/options/browser_options.js    2014-03-07 17:27:45.371931046 -0500
82
 
+++ beta.trusty/src/chrome/browser/resources/options/browser_options.js 2014-03-07 17:27:45.223925625 -0500
 
81
--- beta.trusty.orig/src/chrome/browser/resources/options/browser_options.js    2014-03-15 07:23:44.147040686 -0500
 
82
+++ beta.trusty/src/chrome/browser/resources/options/browser_options.js 2014-03-15 07:23:44.035041244 -0500
83
83
@@ -382,6 +382,23 @@
84
84
             [String(event.target.options[event.target.selectedIndex].value)]);
85
85
       };
147
147
     'setProfilesInfo',
148
148
Index: beta.trusty/src/chrome/browser/resources/options/options.js
149
149
===================================================================
150
 
--- beta.trusty.orig/src/chrome/browser/resources/options/options.js    2014-03-07 17:27:45.371931046 -0500
151
 
+++ beta.trusty/src/chrome/browser/resources/options/options.js 2014-03-07 17:27:45.239926211 -0500
 
150
--- beta.trusty.orig/src/chrome/browser/resources/options/options.js    2014-03-15 07:23:44.147040686 -0500
 
151
+++ beta.trusty/src/chrome/browser/resources/options/options.js 2014-03-15 07:23:44.039041224 -0500
152
152
@@ -15,6 +15,8 @@
153
153
     options.contentSettings.ContentSettingsExceptionsArea;
154
154
 var ContentSettings = options.ContentSettings;
174
174
                                 ContentSettings.getInstance(),
175
175
Index: beta.trusty/src/chrome/browser/resources/options/options_bundle.js
176
176
===================================================================
177
 
--- beta.trusty.orig/src/chrome/browser/resources/options/options_bundle.js     2014-03-07 17:27:45.371931046 -0500
178
 
+++ beta.trusty/src/chrome/browser/resources/options/options_bundle.js  2014-03-07 17:27:45.255926797 -0500
 
177
--- beta.trusty.orig/src/chrome/browser/resources/options/options_bundle.js     2014-03-15 07:23:44.147040686 -0500
 
178
+++ beta.trusty/src/chrome/browser/resources/options/options_bundle.js  2014-03-15 07:23:44.051041165 -0500
179
179
@@ -78,6 +78,8 @@
180
180
 <include src="content_settings_ui.js"></include>
181
181
 <include src="cookies_list.js"></include>
187
187
 <if expr="pp_ifdef('enable_google_now')">
188
188
Index: beta.trusty/src/chrome/browser/resources/options/browser_options.html
189
189
===================================================================
190
 
--- beta.trusty.orig/src/chrome/browser/resources/options/browser_options.html  2014-03-07 17:27:45.371931046 -0500
191
 
+++ beta.trusty/src/chrome/browser/resources/options/browser_options.html       2014-03-07 17:27:45.255926797 -0500
 
190
--- beta.trusty.orig/src/chrome/browser/resources/options/browser_options.html  2014-03-15 07:23:44.147040686 -0500
 
191
+++ beta.trusty/src/chrome/browser/resources/options/browser_options.html       2014-03-15 07:23:44.051041165 -0500
192
192
@@ -417,6 +417,22 @@
193
193
     </div>
194
194
   </section>
214
214
     <div class="checkbox">
215
215
Index: beta.trusty/src/chrome/browser/ui/webui/options/options_ui.cc
216
216
===================================================================
217
 
--- beta.trusty.orig/src/chrome/browser/ui/webui/options/options_ui.cc  2014-03-07 17:27:45.371931046 -0500
218
 
+++ beta.trusty/src/chrome/browser/ui/webui/options/options_ui.cc       2014-03-07 17:27:45.315928994 -0500
 
217
--- beta.trusty.orig/src/chrome/browser/ui/webui/options/options_ui.cc  2014-03-15 07:23:44.147040686 -0500
 
218
+++ beta.trusty/src/chrome/browser/ui/webui/options/options_ui.cc       2014-03-15 07:23:44.091040965 -0500
219
219
@@ -94,6 +94,10 @@
220
220
 #include "chrome/browser/ui/webui/options/geolocation_options_handler.h"
221
221
 #endif
240
240
   AddOptionsPageUIHandler(localized_strings, new GeolocationOptionsHandler());
241
241
Index: beta.trusty/src/chrome/browser/ui/webui/options/browser_options_handler.cc
242
242
===================================================================
243
 
--- beta.trusty.orig/src/chrome/browser/ui/webui/options/browser_options_handler.cc     2014-03-07 17:27:45.371931046 -0500
244
 
+++ beta.trusty/src/chrome/browser/ui/webui/options/browser_options_handler.cc  2014-03-07 17:27:45.323929288 -0500
 
243
--- beta.trusty.orig/src/chrome/browser/ui/webui/options/browser_options_handler.cc     2014-03-15 07:23:44.147040686 -0500
 
244
+++ beta.trusty/src/chrome/browser/ui/webui/options/browser_options_handler.cc  2014-03-15 07:23:44.115040845 -0500
245
245
@@ -190,6 +190,8 @@
246
246
     { "currentUserOnly", IDS_OPTIONS_CURRENT_USER_ONLY },
247
247
     { "advancedSectionTitleContent",
273
273
 #endif
274
274
Index: beta.trusty/src/chrome/chrome_browser_ui.gypi
275
275
===================================================================
276
 
--- beta.trusty.orig/src/chrome/chrome_browser_ui.gypi  2014-03-07 17:27:45.371931046 -0500
277
 
+++ beta.trusty/src/chrome/chrome_browser_ui.gypi       2014-03-07 17:27:45.355930460 -0500
 
276
--- beta.trusty.orig/src/chrome/chrome_browser_ui.gypi  2014-03-15 07:23:44.147040686 -0500
 
277
+++ beta.trusty/src/chrome/chrome_browser_ui.gypi       2014-03-15 07:23:44.127040786 -0500
278
278
@@ -2507,6 +2507,8 @@
279
279
         'browser/ui/webui/options/core_options_handler.h',
280
280
         'browser/ui/webui/options/create_profile_handler.cc',
287
287
Index: beta.trusty/src/chrome/browser/resources/options/desktop_integration_overlay.html
288
288
===================================================================
289
289
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
290
 
+++ beta.trusty/src/chrome/browser/resources/options/desktop_integration_overlay.html   2014-03-07 17:27:45.363930753 -0500
 
290
+++ beta.trusty/src/chrome/browser/resources/options/desktop_integration_overlay.html   2014-03-15 07:23:44.127040786 -0500
291
291
@@ -0,0 +1,26 @@
292
292
+<div id="desktop-integration-area" class="page" hidden>
293
293
+
318
318
Index: beta.trusty/src/chrome/browser/resources/options/desktop_integration_add_website_overlay.js
319
319
===================================================================
320
320
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
321
 
+++ beta.trusty/src/chrome/browser/resources/options/desktop_integration_add_website_overlay.js 2014-03-07 17:27:45.363930753 -0500
 
321
+++ beta.trusty/src/chrome/browser/resources/options/desktop_integration_add_website_overlay.js 2014-03-15 07:23:44.127040786 -0500
322
322
@@ -0,0 +1,47 @@
323
323
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
324
324
+// Use of this source code is governed by a BSD-style license that can be
370
370
Index: beta.trusty/src/chrome/browser/resources/options/desktop_integration_overlay.js
371
371
===================================================================
372
372
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
373
 
+++ beta.trusty/src/chrome/browser/resources/options/desktop_integration_overlay.js     2014-03-07 17:27:45.363930753 -0500
 
373
+++ beta.trusty/src/chrome/browser/resources/options/desktop_integration_overlay.js     2014-03-15 07:23:44.127040786 -0500
374
374
@@ -0,0 +1,203 @@
375
375
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
376
376
+// Use of this source code is governed by a BSD-style license that can be
578
578
Index: beta.trusty/src/chrome/browser/resources/options/desktop_integration_overlay.css
579
579
===================================================================
580
580
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
581
 
+++ beta.trusty/src/chrome/browser/resources/options/desktop_integration_overlay.css    2014-03-07 17:27:45.367930899 -0500
 
581
+++ beta.trusty/src/chrome/browser/resources/options/desktop_integration_overlay.css    2014-03-15 07:23:44.127040786 -0500
582
582
@@ -0,0 +1,71 @@
583
583
+/* Copyright (c) 2012 The Chromium Authors. All rights reserved.
584
584
+ * Use of this source code is governed by a BSD-style license that can be
654
654
Index: beta.trusty/src/chrome/browser/resources/options/desktop_integration_add_website_overlay.html
655
655
===================================================================
656
656
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
657
 
+++ beta.trusty/src/chrome/browser/resources/options/desktop_integration_add_website_overlay.html       2014-03-07 17:27:45.367930899 -0500
 
657
+++ beta.trusty/src/chrome/browser/resources/options/desktop_integration_add_website_overlay.html       2014-03-15 07:23:44.127040786 -0500
658
658
@@ -0,0 +1,16 @@
659
659
+<div id="add-desktop-integration-website-overlay-page" class="page" hidden>
660
660
+  <div class="close-button"></div>
675
675
Index: beta.trusty/src/chrome/browser/ui/webui/options/desktop_integration_settings_handler.cc
676
676
===================================================================
677
677
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
678
 
+++ beta.trusty/src/chrome/browser/ui/webui/options/desktop_integration_settings_handler.cc     2014-03-07 17:27:45.367930899 -0500
 
678
+++ beta.trusty/src/chrome/browser/ui/webui/options/desktop_integration_settings_handler.cc     2014-03-15 07:23:44.131040766 -0500
679
679
@@ -0,0 +1,262 @@
680
680
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
681
681
+// Use of this source code is governed by a BSD-style license that can be
942
942
Index: beta.trusty/src/chrome/browser/ui/webui/options/desktop_integration_settings_handler.h
943
943
===================================================================
944
944
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
945
 
+++ beta.trusty/src/chrome/browser/ui/webui/options/desktop_integration_settings_handler.h      2014-03-07 17:27:45.367930899 -0500
 
945
+++ beta.trusty/src/chrome/browser/ui/webui/options/desktop_integration_settings_handler.h      2014-03-15 07:23:44.143040706 -0500
946
946
@@ -0,0 +1,76 @@
947
947
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
948
948
+// Use of this source code is governed by a BSD-style license that can be