← Back to branch summary

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

« back to all changes in this revision

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

  • Committer: Saikrishna Arcot
  • Date: 2013-04-25 12:34:51 UTC
  • Revision ID: saiarcot895@gmail.com-20130425123451-c9t69y9sxzww2w6x
* New upstream version 27.0.1453.65
* Updated patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/5-desktop-integration-settings.patch
1
 
Index: dev.raring/src/chrome/app/generated_resources.grd
 
1
Index: beta.raring/src/chrome/app/generated_resources.grd
2
2
===================================================================
3
 
--- dev.raring.orig/src/chrome/app/generated_resources.grd      2013-03-29 18:25:55.738215590 -0500
4
 
+++ dev.raring/src/chrome/app/generated_resources.grd   2013-03-29 18:26:27.759072181 -0500
 
3
--- beta.raring.orig/src/chrome/app/generated_resources.grd     2013-04-25 06:54:29.375482573 -0500
 
4
+++ beta.raring/src/chrome/app/generated_resources.grd  2013-04-25 06:54:46.715831228 -0500
5
5
@@ -12186,6 +12186,9 @@
6
6
       <message name="IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT">
7
7
         Web content
48
48
     <!-- Manage Profile Dialog -->
49
49
     <message name="IDS_PROFILES_MANAGE_TITLE" desc="Title of the manage profile dialog">
50
50
       Edit user
51
 
Index: dev.raring/src/chrome/browser/resources/options/options.html
 
51
Index: beta.raring/src/chrome/browser/resources/options/options.html
52
52
===================================================================
53
 
--- dev.raring.orig/src/chrome/browser/resources/options/options.html   2013-03-29 18:25:55.738215590 -0500
54
 
+++ dev.raring/src/chrome/browser/resources/options/options.html        2013-03-29 18:26:27.767072397 -0500
 
53
--- beta.raring.orig/src/chrome/browser/resources/options/options.html  2013-04-25 06:54:29.375482573 -0500
 
54
+++ beta.raring/src/chrome/browser/resources/options/options.html       2013-04-25 06:54:46.715831228 -0500
55
55
@@ -20,6 +20,7 @@
56
56
 <link rel="stylesheet" href="clear_browser_data_overlay.css">
57
57
 <link rel="stylesheet" href="content_settings.css">
76
76
   <include src="handler_options.html">
77
77
   <include src="language_add_language_overlay.html">
78
78
   <include src="managed_user_set_passphrase.html">
79
 
Index: dev.raring/src/chrome/browser/resources/options/browser_options.js
 
79
Index: beta.raring/src/chrome/browser/resources/options/browser_options.js
80
80
===================================================================
81
 
--- dev.raring.orig/src/chrome/browser/resources/options/browser_options.js     2013-03-29 18:25:55.738215590 -0500
82
 
+++ dev.raring/src/chrome/browser/resources/options/browser_options.js  2013-03-29 18:26:27.771072506 -0500
 
81
--- beta.raring.orig/src/chrome/browser/resources/options/browser_options.js    2013-04-25 06:54:29.375482573 -0500
 
82
+++ beta.raring/src/chrome/browser/resources/options/browser_options.js 2013-04-25 06:54:46.715831228 -0500
83
83
@@ -366,6 +366,23 @@
84
84
             [String(event.target.options[event.target.selectedIndex].value)]);
85
85
       };
145
145
     'setMetricsReportingCheckboxState',
146
146
     'setMetricsReportingSettingVisibility',
147
147
     'setPasswordGenerationSettingVisibility',
148
 
Index: dev.raring/src/chrome/browser/resources/options/options.js
 
148
Index: beta.raring/src/chrome/browser/resources/options/options.js
149
149
===================================================================
150
 
--- dev.raring.orig/src/chrome/browser/resources/options/options.js     2013-03-29 18:25:55.738215590 -0500
151
 
+++ dev.raring/src/chrome/browser/resources/options/options.js  2013-03-29 18:26:27.791073049 -0500
 
150
--- beta.raring.orig/src/chrome/browser/resources/options/options.js    2013-04-25 06:54:29.375482573 -0500
 
151
+++ beta.raring/src/chrome/browser/resources/options/options.js 2013-04-25 06:54:46.719831308 -0500
152
152
@@ -14,6 +14,8 @@
153
153
     options.contentSettings.ContentSettingsExceptionsArea;
154
154
 var ContentSettings = options.ContentSettings;
172
172
   if (HandlerOptions && $('manage-handlers-button')) {
173
173
     OptionsPage.registerOverlay(HandlerOptions.getInstance(),
174
174
                                 ContentSettings.getInstance(),
175
 
Index: dev.raring/src/chrome/browser/resources/options/options_bundle.js
 
175
Index: beta.raring/src/chrome/browser/resources/options/options_bundle.js
176
176
===================================================================
177
 
--- dev.raring.orig/src/chrome/browser/resources/options/options_bundle.js      2013-03-29 18:25:55.738215590 -0500
178
 
+++ dev.raring/src/chrome/browser/resources/options/options_bundle.js   2013-03-29 18:26:27.791073049 -0500
 
177
--- beta.raring.orig/src/chrome/browser/resources/options/options_bundle.js     2013-04-25 06:54:29.375482573 -0500
 
178
+++ beta.raring/src/chrome/browser/resources/options/options_bundle.js  2013-04-25 06:54:46.719831308 -0500
179
179
@@ -74,6 +74,8 @@
180
180
 <include src="content_settings_ui.js"></include>
181
181
 <include src="cookies_list.js"></include>
185
185
 <include src="factory_reset_overlay.js"></include>
186
186
 <include src="managed_user_settings.js"></include>
187
187
 <include src="managed_user_set_passphrase.js"></include>
188
 
Index: dev.raring/src/chrome/browser/resources/options/browser_options.html
 
188
Index: beta.raring/src/chrome/browser/resources/options/browser_options.html
189
189
===================================================================
190
 
--- dev.raring.orig/src/chrome/browser/resources/options/browser_options.html   2013-03-29 18:25:55.738215590 -0500
191
 
+++ dev.raring/src/chrome/browser/resources/options/browser_options.html        2013-03-29 18:26:27.803073374 -0500
 
190
--- beta.raring.orig/src/chrome/browser/resources/options/browser_options.html  2013-04-25 06:54:29.375482573 -0500
 
191
+++ beta.raring/src/chrome/browser/resources/options/browser_options.html       2013-04-25 06:54:46.723831388 -0500
192
192
@@ -381,6 +381,22 @@
193
193
     </div>
194
194
   </section>
212
212
   <section id="passwords-and-autofill-section">
213
213
     <h3 i18n-content="passwordsAndAutofillGroupName"></h3>
214
214
     <div class="checkbox">
215
 
Index: dev.raring/src/chrome/browser/ui/webui/options/options_ui.cc
 
215
Index: beta.raring/src/chrome/browser/ui/webui/options/options_ui.cc
216
216
===================================================================
217
 
--- dev.raring.orig/src/chrome/browser/ui/webui/options/options_ui.cc   2013-03-29 18:25:55.738215590 -0500
218
 
+++ dev.raring/src/chrome/browser/ui/webui/options/options_ui.cc        2013-03-29 18:26:27.819073807 -0500
 
217
--- beta.raring.orig/src/chrome/browser/ui/webui/options/options_ui.cc  2013-04-25 06:54:29.375482573 -0500
 
218
+++ beta.raring/src/chrome/browser/ui/webui/options/options_ui.cc       2013-04-25 06:54:46.723831388 -0500
219
219
@@ -88,6 +88,10 @@
220
220
 #include "chrome/browser/ui/webui/options/certificate_manager_handler.h"
221
221
 #endif
238
238
   AddOptionsPageUIHandler(localized_strings, new FontSettingsHandler());
239
239
   AddOptionsPageUIHandler(localized_strings, new HomePageOverlayHandler());
240
240
   AddOptionsPageUIHandler(localized_strings,
241
 
Index: dev.raring/src/chrome/browser/ui/webui/options/browser_options_handler.cc
 
241
Index: beta.raring/src/chrome/browser/ui/webui/options/browser_options_handler.cc
242
242
===================================================================
243
 
--- dev.raring.orig/src/chrome/browser/ui/webui/options/browser_options_handler.cc      2013-03-29 18:25:55.738215590 -0500
244
 
+++ dev.raring/src/chrome/browser/ui/webui/options/browser_options_handler.cc   2013-03-29 18:26:27.827074026 -0500
 
243
--- beta.raring.orig/src/chrome/browser/ui/webui/options/browser_options_handler.cc     2013-04-25 06:54:29.375482573 -0500
 
244
+++ beta.raring/src/chrome/browser/ui/webui/options/browser_options_handler.cc  2013-04-25 06:54:46.727831468 -0500
245
245
@@ -181,6 +181,8 @@
246
246
     { "currentUserOnly", IDS_OPTIONS_CURRENT_USER_ONLY },
247
247
     { "advancedSectionTitleContent",
271
271
 #if defined(ENABLE_SETTINGS_APP)
272
272
     { "profilesAppListSwitch", IDS_SETTINGS_APP_PROFILES_SWITCH_BUTTON_LABEL },
273
273
 #endif
274
 
Index: dev.raring/src/chrome/chrome_browser_ui.gypi
 
274
Index: beta.raring/src/chrome/chrome_browser_ui.gypi
275
275
===================================================================
276
 
--- dev.raring.orig/src/chrome/chrome_browser_ui.gypi   2013-03-29 18:25:55.738215590 -0500
277
 
+++ dev.raring/src/chrome/chrome_browser_ui.gypi        2013-03-29 18:26:27.839074352 -0500
 
276
--- beta.raring.orig/src/chrome/chrome_browser_ui.gypi  2013-04-25 06:54:29.375482573 -0500
 
277
+++ beta.raring/src/chrome/chrome_browser_ui.gypi       2013-04-25 06:54:46.731831548 -0500
278
278
@@ -2094,6 +2094,8 @@
279
279
         'browser/ui/webui/options/cookies_view_handler.h',
280
280
         'browser/ui/webui/options/core_options_handler.cc',
284
284
         'browser/ui/webui/options/font_settings_handler.cc',
285
285
         'browser/ui/webui/options/font_settings_handler.h',
286
286
         'browser/ui/webui/options/font_settings_utils.h',
287
 
Index: dev.raring/src/chrome/browser/resources/options/desktop_integration_overlay.html
 
287
Index: beta.raring/src/chrome/browser/resources/options/desktop_integration_overlay.html
288
288
===================================================================
289
289
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
290
 
+++ dev.raring/src/chrome/browser/resources/options/desktop_integration_overlay.html    2013-03-29 18:26:27.839074352 -0500
 
290
+++ beta.raring/src/chrome/browser/resources/options/desktop_integration_overlay.html   2013-04-25 06:54:46.731831548 -0500
291
291
@@ -0,0 +1,26 @@
292
292
+<div id="desktop-integration-area" class="page" hidden>
293
293
+
315
315
+
316
316
+</div>
317
317
+
318
 
Index: dev.raring/src/chrome/browser/resources/options/desktop_integration_add_website_overlay.js
 
318
Index: beta.raring/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
 
+++ dev.raring/src/chrome/browser/resources/options/desktop_integration_add_website_overlay.js  2013-03-29 18:26:27.843074460 -0500
 
321
+++ beta.raring/src/chrome/browser/resources/options/desktop_integration_add_website_overlay.js 2013-04-25 06:54:46.731831548 -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
367
367
+    AddDesktopIntegrationWebsiteOverlay: AddDesktopIntegrationWebsiteOverlay
368
368
+  };
369
369
+});
370
 
Index: dev.raring/src/chrome/browser/resources/options/desktop_integration_overlay.js
 
370
Index: beta.raring/src/chrome/browser/resources/options/desktop_integration_overlay.js
371
371
===================================================================
372
372
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
373
 
+++ dev.raring/src/chrome/browser/resources/options/desktop_integration_overlay.js      2013-03-29 18:26:27.843074460 -0500
 
373
+++ beta.raring/src/chrome/browser/resources/options/desktop_integration_overlay.js     2013-04-25 06:54:46.731831548 -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
575
575
+  };
576
576
+});
577
577
+
578
 
Index: dev.raring/src/chrome/browser/resources/options/desktop_integration_overlay.css
 
578
Index: beta.raring/src/chrome/browser/resources/options/desktop_integration_overlay.css
579
579
===================================================================
580
580
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
581
 
+++ dev.raring/src/chrome/browser/resources/options/desktop_integration_overlay.css     2013-03-29 18:26:27.843074460 -0500
 
581
+++ beta.raring/src/chrome/browser/resources/options/desktop_integration_overlay.css    2013-04-25 06:54:46.731831548 -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
651
651
+  padding-bottom: 2px;
652
652
+  padding-top: 2px;
653
653
+}
654
 
Index: dev.raring/src/chrome/browser/resources/options/desktop_integration_add_website_overlay.html
 
654
Index: beta.raring/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
 
+++ dev.raring/src/chrome/browser/resources/options/desktop_integration_add_website_overlay.html        2013-03-29 18:26:27.843074460 -0500
 
657
+++ beta.raring/src/chrome/browser/resources/options/desktop_integration_add_website_overlay.html       2013-04-25 06:54:46.731831548 -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>
672
672
+    <button id="add-integration-website-overlay-ok-button" i18n-content="ok"></button>
673
673
+  </div>
674
674
+</div>
675
 
Index: dev.raring/src/chrome/browser/ui/webui/options/desktop_integration_settings_handler.cc
 
675
Index: beta.raring/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
 
+++ dev.raring/src/chrome/browser/ui/webui/options/desktop_integration_settings_handler.cc      2013-03-29 18:26:27.843074460 -0500
 
678
+++ beta.raring/src/chrome/browser/ui/webui/options/desktop_integration_settings_handler.cc     2013-04-25 06:54:46.735831628 -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
939
939
+}
940
940
+
941
941
+}  // namespace options
942
 
Index: dev.raring/src/chrome/browser/ui/webui/options/desktop_integration_settings_handler.h
 
942
Index: beta.raring/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
 
+++ dev.raring/src/chrome/browser/ui/webui/options/desktop_integration_settings_handler.h       2013-03-29 18:26:27.843074460 -0500
 
945
+++ beta.raring/src/chrome/browser/ui/webui/options/desktop_integration_settings_handler.h      2013-04-25 06:54:46.735831628 -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