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

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

Issue 9181013: [uber page] Migrate remaining Personal options into Browser options. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: How about another rebase! (damn you generated_resources.grd) Created 8 years, 11 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="pref_ui.js"></include> 9 <include src="pref_ui.js"></include>
10 <include src="deletable_item_list.js"></include> 10 <include src="deletable_item_list.js"></include>
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 var CertificateEditCaTrustOverlay = options.CertificateEditCaTrustOverlay; 51 var CertificateEditCaTrustOverlay = options.CertificateEditCaTrustOverlay;
52 var CertificateImportErrorOverlay = options.CertificateImportErrorOverlay; 52 var CertificateImportErrorOverlay = options.CertificateImportErrorOverlay;
53 </if> 53 </if>
54 <include src="advanced_options.js"></include> 54 <include src="advanced_options.js"></include>
55 <include src="alert_overlay.js"></include> 55 <include src="alert_overlay.js"></include>
56 <include src="autofill_edit_address_overlay.js"></include> 56 <include src="autofill_edit_address_overlay.js"></include>
57 <include src="autofill_edit_creditcard_overlay.js"></include> 57 <include src="autofill_edit_creditcard_overlay.js"></include>
58 <include src="autofill_options_list.js"></include> 58 <include src="autofill_options_list.js"></include>
59 <include src="autofill_options.js"></include> 59 <include src="autofill_options.js"></include>
60 <include src="browser_options.js"></include> 60 <include src="browser_options.js"></include>
61 <include src="browser_options_profile_list.js"></include>
61 <include src="browser_options_startup_page_list.js"></include> 62 <include src="browser_options_startup_page_list.js"></include>
62 <include src="clear_browser_data_overlay.js"></include> 63 <include src="clear_browser_data_overlay.js"></include>
63 <include src="content_settings.js"></include> 64 <include src="content_settings.js"></include>
64 <include src="content_settings_exceptions_area.js"></include> 65 <include src="content_settings_exceptions_area.js"></include>
65 <include src="content_settings_ui.js"></include> 66 <include src="content_settings_ui.js"></include>
66 <include src="cookies_list.js"></include> 67 <include src="cookies_list.js"></include>
67 <include src="cookies_view.js"></include> 68 <include src="cookies_view.js"></include>
68 <include src="font_settings.js"></include> 69 <include src="font_settings.js"></include>
69 <if expr="pp_ifdef('enable_register_protocol_handler')"> 70 <if expr="pp_ifdef('enable_register_protocol_handler')">
70 <include src="handler_options.js"></script> 71 <include src="handler_options.js"></script>
71 <include src="handler_options_list.js"></script> 72 <include src="handler_options_list.js"></script>
72 </if> 73 </if>
73 <include src="home_page_overlay.js"></include> 74 <include src="home_page_overlay.js"></include>
74 <include src="import_data_overlay.js"></include> 75 <include src="import_data_overlay.js"></include>
75 <include src="instant_confirm_overlay.js"></include> 76 <include src="instant_confirm_overlay.js"></include>
76 <if expr="pp_ifdef('enable_web_intents')"> 77 <if expr="pp_ifdef('enable_web_intents')">
77 <include src="intents_list.js"></include> 78 <include src="intents_list.js"></include>
78 <include src="intents_view.js"></include> 79 <include src="intents_view.js"></include>
79 </if> 80 </if>
80 <include src="language_add_language_overlay.js"></include> 81 <include src="language_add_language_overlay.js"></include>
81 <include src="language_list.js"></include> 82 <include src="language_list.js"></include>
82 <include src="language_options.js"></include> 83 <include src="language_options.js"></include>
83 <include src="manage_profile_overlay.js"></include> 84 <include src="manage_profile_overlay.js"></include>
84 <include src="password_manager.js"></include> 85 <include src="password_manager.js"></include>
85 <include src="password_manager_list.js"></include> 86 <include src="password_manager_list.js"></include>
86 <include src="personal_options.js"></include>
87 <include src="personal_options_profile_list.js"></include>
88 <include src="profiles_icon_grid.js"></include> 87 <include src="profiles_icon_grid.js"></include>
89 <include src="search_engine_manager.js"></include> 88 <include src="search_engine_manager.js"></include>
90 <include src="search_engine_manager_engine_list.js"></include> 89 <include src="search_engine_manager_engine_list.js"></include>
91 <include src="search_page.js"></include> 90 <include src="search_page.js"></include>
92 <include src="startup_overlay.js"></include> 91 <include src="startup_overlay.js"></include>
93 <include src="../sync_setup_overlay.js"></include> 92 <include src="../sync_setup_overlay.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/personal_options.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698