Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(66)

Side by Side Diff: chrome/browser/resources/options/options_bundle.js

Issue 151003004: Add an automatic settings reset banner. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase on top of transaction patch. Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 // 4 //
5 // This file exists to aggregate all of the javascript used by the 5 // This file exists to aggregate all of the javascript used by the
6 // settings page into a single file which will be flattened and served 6 // settings page into a single file which will be flattened and served
7 // as a single resource. 7 // as a single resource.
8 <include src="preferences.js"></include> 8 <include src="preferences.js"></include>
9 <include src="controlled_setting.js"></include> 9 <include src="controlled_setting.js"></include>
10 <include src="deletable_item_list.js"></include> 10 <include src="deletable_item_list.js"></include>
11 <include src="editable_text_field.js"></include> 11 <include src="editable_text_field.js"></include>
12 <include src="inline_editable_list.js"></include> 12 <include src="inline_editable_list.js"></include>
13 <include src="options_page.js"></include> 13 <include src="options_page.js"></include>
14 <include src="pref_ui.js"></include> 14 <include src="pref_ui.js"></include>
15 <include src="settings_dialog.js"></include> 15 <include src="settings_dialog.js"></include>
16 <include src="settings_banner.js"></include>
16 <if expr="pp_ifdef('chromeos')"> 17 <if expr="pp_ifdef('chromeos')">
17 <include src="../chromeos/user_images_grid.js"></include> 18 <include src="../chromeos/user_images_grid.js"></include>
18 // DO NOT BREAK THE FOLLOWING INCLUDE LINE INTO SEPARATE LINES! 19 // DO NOT BREAK THE FOLLOWING INCLUDE LINE INTO SEPARATE LINES!
19 // Even though the include line spans more than 80 characters, 20 // Even though the include line spans more than 80 characters,
20 // The grit html inlining parser will leave the end tag behind, 21 // The grit html inlining parser will leave the end tag behind,
21 // causing a runtime JS break. 22 // causing a runtime JS break.
22 <include src="../../../../ui/webui/resources/js/chromeos/ui_account_tweaks.js">< /include> 23 <include src="../../../../ui/webui/resources/js/chromeos/ui_account_tweaks.js">< /include>
23 <include src="chromeos/change_picture_options.js"></include> 24 <include src="chromeos/change_picture_options.js"></include>
24 <include src="chromeos/internet_detail_ip_address_field.js"></include> 25 <include src="chromeos/internet_detail_ip_address_field.js"></include>
25 <include src="chromeos/internet_detail.js"></include> 26 <include src="chromeos/internet_detail.js"></include>
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 var CertificateRestoreOverlay = options.CertificateRestoreOverlay; 59 var CertificateRestoreOverlay = options.CertificateRestoreOverlay;
59 var CertificateBackupOverlay = options.CertificateBackupOverlay; 60 var CertificateBackupOverlay = options.CertificateBackupOverlay;
60 var CertificateEditCaTrustOverlay = options.CertificateEditCaTrustOverlay; 61 var CertificateEditCaTrustOverlay = options.CertificateEditCaTrustOverlay;
61 var CertificateImportErrorOverlay = options.CertificateImportErrorOverlay; 62 var CertificateImportErrorOverlay = options.CertificateImportErrorOverlay;
62 </if> 63 </if>
63 <include src="alert_overlay.js"></include> 64 <include src="alert_overlay.js"></include>
64 <include src="autofill_edit_address_overlay.js"></include> 65 <include src="autofill_edit_address_overlay.js"></include>
65 <include src="autofill_edit_creditcard_overlay.js"></include> 66 <include src="autofill_edit_creditcard_overlay.js"></include>
66 <include src="autofill_options_list.js"></include> 67 <include src="autofill_options_list.js"></include>
67 <include src="autofill_options.js"></include> 68 <include src="autofill_options.js"></include>
69 <include src="automatic_settings_reset_banner.js"></include>
68 <include src="browser_options.js"></include> 70 <include src="browser_options.js"></include>
69 <include src="browser_options_profile_list.js"></include> 71 <include src="browser_options_profile_list.js"></include>
70 <include src="browser_options_startup_page_list.js"></include> 72 <include src="browser_options_startup_page_list.js"></include>
71 <include src="clear_browser_data_overlay.js"></include> 73 <include src="clear_browser_data_overlay.js"></include>
72 <include src="confirm_dialog.js"></include> 74 <include src="confirm_dialog.js"></include>
73 <include src="content_settings.js"></include> 75 <include src="content_settings.js"></include>
74 <include src="content_settings2.js"></include> 76 <include src="content_settings2.js"></include>
75 <include src="content_settings_exceptions_area.js"></include> 77 <include src="content_settings_exceptions_area.js"></include>
76 <include src="content_settings_ui.js"></include> 78 <include src="content_settings_ui.js"></include>
77 <include src="cookies_list.js"></include> 79 <include src="cookies_list.js"></include>
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 <include src="search_engine_manager.js"></include> 111 <include src="search_engine_manager.js"></include>
110 <include src="search_engine_manager_engine_list.js"></include> 112 <include src="search_engine_manager_engine_list.js"></include>
111 <include src="search_page.js"></include> 113 <include src="search_page.js"></include>
112 <include src="startup_overlay.js"></include> 114 <include src="startup_overlay.js"></include>
113 <include src="../sync_setup_overlay.js"></include> 115 <include src="../sync_setup_overlay.js"></include>
114 <include src="../uber/uber_utils.js"></include> 116 <include src="../uber/uber_utils.js"></include>
115 <include src="options.js"></include> 117 <include src="options.js"></include>
116 <if expr="pp_ifdef('enable_settings_app')"> 118 <if expr="pp_ifdef('enable_settings_app')">
117 <include src="options_settings_app.js"></include> 119 <include src="options_settings_app.js"></include>
118 </if> 120 </if>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/options.js ('k') | chrome/browser/resources/options/reset_profile_settings_banner.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698