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

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

Issue 9560005: [uber page] Merge advanced options page into browser options. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Rebase again. Created 8 years, 9 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="controlled_setting.js"></include> 8 <include src="controlled_setting.js"></include>
9 <include src="deletable_item_list.js"></include> 9 <include src="deletable_item_list.js"></include>
10 <include src="inline_editable_list.js"></include> 10 <include src="inline_editable_list.js"></include>
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 <include src="certificate_restore_overlay.js"></include> 47 <include src="certificate_restore_overlay.js"></include>
48 <include src="certificate_backup_overlay.js"></include> 48 <include src="certificate_backup_overlay.js"></include>
49 <include src="certificate_edit_ca_trust_overlay.js"></include> 49 <include src="certificate_edit_ca_trust_overlay.js"></include>
50 <include src="certificate_import_error_overlay.js"></include> 50 <include src="certificate_import_error_overlay.js"></include>
51 var CertificateManager = options.CertificateManager; 51 var CertificateManager = options.CertificateManager;
52 var CertificateRestoreOverlay = options.CertificateRestoreOverlay; 52 var CertificateRestoreOverlay = options.CertificateRestoreOverlay;
53 var CertificateBackupOverlay = options.CertificateBackupOverlay; 53 var CertificateBackupOverlay = options.CertificateBackupOverlay;
54 var CertificateEditCaTrustOverlay = options.CertificateEditCaTrustOverlay; 54 var CertificateEditCaTrustOverlay = options.CertificateEditCaTrustOverlay;
55 var CertificateImportErrorOverlay = options.CertificateImportErrorOverlay; 55 var CertificateImportErrorOverlay = options.CertificateImportErrorOverlay;
56 </if> 56 </if>
57 <include src="advanced_options.js"></include>
58 <include src="alert_overlay.js"></include> 57 <include src="alert_overlay.js"></include>
59 <include src="autofill_edit_address_overlay.js"></include> 58 <include src="autofill_edit_address_overlay.js"></include>
60 <include src="autofill_edit_creditcard_overlay.js"></include> 59 <include src="autofill_edit_creditcard_overlay.js"></include>
61 <include src="autofill_options_list.js"></include> 60 <include src="autofill_options_list.js"></include>
62 <include src="autofill_options.js"></include> 61 <include src="autofill_options.js"></include>
63 <include src="browser_options.js"></include> 62 <include src="browser_options.js"></include>
64 <include src="browser_options_profile_list.js"></include> 63 <include src="browser_options_profile_list.js"></include>
65 <include src="browser_options_startup_page_list.js"></include> 64 <include src="browser_options_startup_page_list.js"></include>
66 <include src="clear_browser_data_overlay.js"></include> 65 <include src="clear_browser_data_overlay.js"></include>
67 <include src="content_settings.js"></include> 66 <include src="content_settings.js"></include>
(...skipping 17 matching lines...) Expand all
85 <include src="password_manager_list.js"></include> 84 <include src="password_manager_list.js"></include>
86 <include src="profiles_icon_grid.js"></include> 85 <include src="profiles_icon_grid.js"></include>
87 <include src="search_engine_manager.js"></include> 86 <include src="search_engine_manager.js"></include>
88 <include src="search_engine_manager_engine_list.js"></include> 87 <include src="search_engine_manager_engine_list.js"></include>
89 <include src="search_page.js"></include> 88 <include src="search_page.js"></include>
90 <include src="session_restore_overlay.js"></include> 89 <include src="session_restore_overlay.js"></include>
91 <include src="startup_overlay.js"></include> 90 <include src="startup_overlay.js"></include>
92 <include src="../sync_setup_overlay.js"></include> 91 <include src="../sync_setup_overlay.js"></include>
93 <include src="../uber/uber_utils.js"></include> 92 <include src="../uber/uber_utils.js"></include>
94 <include src="options.js"></include> 93 <include src="options.js"></include>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options2/options.js ('k') | chrome/browser/resources/options2/options_page.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698