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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 406143002: webui: Remove unnecessary </include>s everywhere. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: GARRRRRR Created 6 years, 5 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
« no previous file with comments | « chrome/browser/resources/inline_login/inline_login.js ('k') | chrome/browser/resources/pdf/polymer_loader.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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">
9 <include src="controlled_setting.js"></include> 9 <include src="controlled_setting.js">
10 <include src="deletable_item_list.js"></include> 10 <include src="deletable_item_list.js">
11 <include src="editable_text_field.js"></include> 11 <include src="editable_text_field.js">
12 <include src="hotword_search_setting_indicator.js"></include> 12 <include src="hotword_search_setting_indicator.js">
13 <include src="inline_editable_list.js"></include> 13 <include src="inline_editable_list.js">
14 <include src="options_page.js"></include> 14 <include src="options_page.js">
15 <include src="pref_ui.js"></include> 15 <include src="pref_ui.js">
16 <include src="settings_dialog.js"></include> 16 <include src="settings_dialog.js">
17 <include src="settings_banner.js"></include> 17 <include src="settings_banner.js">
18 <if expr="chromeos"> 18 <if expr="chromeos">
19 <include src="../chromeos/user_images_grid.js"></include> 19 <include src="../chromeos/user_images_grid.js">
20 // DO NOT BREAK THE FOLLOWING INCLUDE LINE INTO SEPARATE LINES! 20 <include src="../../../../ui/webui/resources/js/chromeos/ui_account_tweaks.js">
21 // Even though the include line spans more than 80 characters, 21 <include src="chromeos/change_picture_options.js">
22 // The grit html inlining parser will leave the end tag behind, 22 <include src="chromeos/internet_detail_ip_address_field.js">
23 // causing a runtime JS break. 23 <include src="chromeos/internet_detail.js">
24 <include src="../../../../ui/webui/resources/js/chromeos/ui_account_tweaks.js">< /include> 24 <include src="chromeos/network_list.js">
25 <include src="chromeos/change_picture_options.js"></include> 25 <include src="chromeos/preferred_networks.js">
26 <include src="chromeos/internet_detail_ip_address_field.js"></include> 26 <include src="chromeos/bluetooth_device_list.js">
27 <include src="chromeos/internet_detail.js"></include> 27 <include src="chromeos/bluetooth_add_device_overlay.js">
28 <include src="chromeos/network_list.js"></include> 28 <include src="chromeos/bluetooth_pair_device_overlay.js">
29 <include src="chromeos/preferred_networks.js"></include> 29 <include src="chromeos/accounts_options.js">
30 <include src="chromeos/bluetooth_device_list.js"></include> 30 <include src="chromeos/proxy_rules_list.js">
31 <include src="chromeos/bluetooth_add_device_overlay.js"></include> 31 <include src="chromeos/accounts_user_list.js">
32 <include src="chromeos/bluetooth_pair_device_overlay.js"></include> 32 <include src="chromeos/accounts_user_name_edit.js">
33 <include src="chromeos/accounts_options.js"></include> 33 <include src="chromeos/consumer_management_overlay.js">
34 <include src="chromeos/proxy_rules_list.js"></include> 34 <include src="chromeos/display_options.js">
35 <include src="chromeos/accounts_user_list.js"></include> 35 <include src="chromeos/display_overscan.js">
36 <include src="chromeos/accounts_user_name_edit.js"></include> 36 <include src="chromeos/keyboard_overlay.js">
37 <include src="chromeos/consumer_management_overlay.js"></include> 37 <include src="chromeos/pointer_overlay.js">
38 <include src="chromeos/display_options.js"></include> 38 <include src="chromeos/third_party_ime_confirm_overlay.js">
39 <include src="chromeos/display_overscan.js"></include>
40 <include src="chromeos/keyboard_overlay.js"></include>
41 <include src="chromeos/pointer_overlay.js"></include>
42 <include src="chromeos/third_party_ime_confirm_overlay.js"></include>
43 var AccountsOptions = options.AccountsOptions; 39 var AccountsOptions = options.AccountsOptions;
44 var ChangePictureOptions = options.ChangePictureOptions; 40 var ChangePictureOptions = options.ChangePictureOptions;
45 var ConsumerManagementOverlay = options.ConsumerManagementOverlay; 41 var ConsumerManagementOverlay = options.ConsumerManagementOverlay;
46 var DetailsInternetPage = options.internet.DetailsInternetPage; 42 var DetailsInternetPage = options.internet.DetailsInternetPage;
47 var DisplayOptions = options.DisplayOptions; 43 var DisplayOptions = options.DisplayOptions;
48 var DisplayOverscan = options.DisplayOverscan; 44 var DisplayOverscan = options.DisplayOverscan;
49 var BluetoothOptions = options.BluetoothOptions; 45 var BluetoothOptions = options.BluetoothOptions;
50 var BluetoothPairing = options.BluetoothPairing; 46 var BluetoothPairing = options.BluetoothPairing;
51 var KeyboardOverlay = options.KeyboardOverlay; 47 var KeyboardOverlay = options.KeyboardOverlay;
52 var PointerOverlay = options.PointerOverlay; 48 var PointerOverlay = options.PointerOverlay;
53 var UIAccountTweaks = uiAccountTweaks.UIAccountTweaks; 49 var UIAccountTweaks = uiAccountTweaks.UIAccountTweaks;
54 </if> 50 </if>
55 <if expr="use_nss"> 51 <if expr="use_nss">
56 <include src="certificate_tree.js"></include> 52 <include src="certificate_tree.js">
57 <include src="certificate_manager.js"></include> 53 <include src="certificate_manager.js">
58 <include src="certificate_restore_overlay.js"></include> 54 <include src="certificate_restore_overlay.js">
59 <include src="certificate_backup_overlay.js"></include> 55 <include src="certificate_backup_overlay.js">
60 <include src="certificate_edit_ca_trust_overlay.js"></include> 56 <include src="certificate_edit_ca_trust_overlay.js">
61 <include src="certificate_import_error_overlay.js"></include> 57 <include src="certificate_import_error_overlay.js">
62 var CertificateManager = options.CertificateManager; 58 var CertificateManager = options.CertificateManager;
63 var CertificateRestoreOverlay = options.CertificateRestoreOverlay; 59 var CertificateRestoreOverlay = options.CertificateRestoreOverlay;
64 var CertificateBackupOverlay = options.CertificateBackupOverlay; 60 var CertificateBackupOverlay = options.CertificateBackupOverlay;
65 var CertificateEditCaTrustOverlay = options.CertificateEditCaTrustOverlay; 61 var CertificateEditCaTrustOverlay = options.CertificateEditCaTrustOverlay;
66 var CertificateImportErrorOverlay = options.CertificateImportErrorOverlay; 62 var CertificateImportErrorOverlay = options.CertificateImportErrorOverlay;
67 </if> 63 </if>
68 <include src="alert_overlay.js"></include> 64 <include src="alert_overlay.js">
69 <include src="autofill_edit_address_overlay.js"></include> 65 <include src="autofill_edit_address_overlay.js">
70 <include src="autofill_edit_creditcard_overlay.js"></include> 66 <include src="autofill_edit_creditcard_overlay.js">
71 <include src="autofill_options_list.js"></include> 67 <include src="autofill_options_list.js">
72 <include src="autofill_options.js"></include> 68 <include src="autofill_options.js">
73 <include src="automatic_settings_reset_banner.js"></include> 69 <include src="automatic_settings_reset_banner.js">
74 <include src="browser_options.js"></include> 70 <include src="browser_options.js">
75 <include src="browser_options_profile_list.js"></include> 71 <include src="browser_options_profile_list.js">
76 <include src="browser_options_startup_page_list.js"></include> 72 <include src="browser_options_startup_page_list.js">
77 <include src="clear_browser_data_overlay.js"></include> 73 <include src="clear_browser_data_overlay.js">
78 <include src="confirm_dialog.js"></include> 74 <include src="confirm_dialog.js">
79 <include src="content_settings.js"></include> 75 <include src="content_settings.js">
80 <include src="content_settings_exceptions_area.js"></include> 76 <include src="content_settings_exceptions_area.js">
81 <include src="content_settings_ui.js"></include> 77 <include src="content_settings_ui.js">
82 <include src="cookies_list.js"></include> 78 <include src="cookies_list.js">
83 <include src="cookies_view.js"></include> 79 <include src="cookies_view.js">
84 <include src="factory_reset_overlay.js"></include> 80 <include src="factory_reset_overlay.js">
85 <include src="font_settings.js"></include> 81 <include src="font_settings.js">
86 <if expr="enable_google_now"> 82 <if expr="enable_google_now">
87 <include src="geolocation_options.js"></include> 83 <include src="geolocation_options.js">
88 </if> 84 </if>
89 <include src="handler_options.js"></include> 85 <include src="handler_options.js">
90 <include src="handler_options_list.js"></include> 86 <include src="handler_options_list.js">
91 <include src="home_page_overlay.js"></include> 87 <include src="home_page_overlay.js">
92 <include src="hotword_confirm_dialog.js"></include> 88 <include src="hotword_confirm_dialog.js">
93 <include src="import_data_overlay.js"></include> 89 <include src="import_data_overlay.js">
94 <include src="language_add_language_overlay.js"></include> 90 <include src="language_add_language_overlay.js">
95 <if expr="not is_macosx"> 91 <if expr="not is_macosx">
96 <include src="language_dictionary_overlay_word_list.js"></include> 92 <include src="language_dictionary_overlay_word_list.js">
97 <include src="language_dictionary_overlay.js"></include> 93 <include src="language_dictionary_overlay.js">
98 </if> 94 </if>
99 <include src="language_list.js"></include> 95 <include src="language_list.js">
100 <include src="language_options.js"></include> 96 <include src="language_options.js">
101 <include src="manage_profile_overlay.js"></include> 97 <include src="manage_profile_overlay.js">
102 <include src="managed_user_create_confirm.js"</include> 98 <include src="managed_user_create_confirm.js">
103 <include src="managed_user_import.js"></include> 99 <include src="managed_user_import.js">
104 <include src="managed_user_learn_more.js"</include> 100 <include src="managed_user_learn_more.js">
105 <include src="managed_user_list.js"></include> 101 <include src="managed_user_list.js">
106 <include src="managed_user_list_data.js"></include> 102 <include src="managed_user_list_data.js">
107 <include src="options_focus_manager.js"></include> 103 <include src="options_focus_manager.js">
108 <include src="origin_resources_list.js"></include> 104 <include src="origin_resources_list.js">
109 <include src="password_manager.js"></include> 105 <include src="password_manager.js">
110 <include src="password_manager_list.js"></include> 106 <include src="password_manager_list.js">
111 <include src="profiles_icon_grid.js"></include> 107 <include src="profiles_icon_grid.js">
112 <include src="reset_profile_settings_banner.js"></include> 108 <include src="reset_profile_settings_banner.js">
113 <include src="reset_profile_settings_overlay.js"></include> 109 <include src="reset_profile_settings_overlay.js">
114 <include src="search_engine_manager.js"></include> 110 <include src="search_engine_manager.js">
115 <include src="search_engine_manager_engine_list.js"></include> 111 <include src="search_engine_manager_engine_list.js">
116 <include src="search_page.js"></include> 112 <include src="search_page.js">
117 <include src="startup_overlay.js"></include> 113 <include src="startup_overlay.js">
118 <include src="website_settings.js"></include> 114 <include src="website_settings.js">
119 <include src="../sync_setup_overlay.js"></include> 115 <include src="../sync_setup_overlay.js">
120 <include src="../uber/uber_utils.js"></include> 116 <include src="../uber/uber_utils.js">
121 <include src="options.js"></include> 117 <include src="options.js">
122 <if expr="enable_settings_app"> 118 <if expr="enable_settings_app">
123 <include src="options_settings_app.js"></include> 119 <include src="options_settings_app.js">
124 </if> 120 </if>
OLDNEW
« no previous file with comments | « chrome/browser/resources/inline_login/inline_login.js ('k') | chrome/browser/resources/pdf/polymer_loader.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698