Commit bb508b30 authored by dbeam@chromium.org's avatar dbeam@chromium.org

webui: Remove unnecessary </include>s everywhere.

R=tbreisacher@chromium.org
TBR=kevers@chromium.org
BUG=393873
TEST=no red bots

Review URL: https://codereview.chromium.org/406143002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285088 0039d316-1c4b-4281-b951-d872f2087c98
parent 3d2d809d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
<include src="../../../ui/webui/resources/js/util.js"></include> <include src="../../../ui/webui/resources/js/util.js">
function reload() { function reload() {
if ($('helpTooltip')) if ($('helpTooltip'))
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* @fileoverview Login UI based on a stripped down OOBE controller. * @fileoverview Login UI based on a stripped down OOBE controller.
*/ */
<include src="login_common.js"></include> <include src="login_common.js">
cr.define('cr.ui.Oobe', function() { cr.define('cr.ui.Oobe', function() {
return { return {
......
...@@ -6,31 +6,31 @@ ...@@ -6,31 +6,31 @@
* @fileoverview Common OOBE controller methods. * @fileoverview Common OOBE controller methods.
*/ */
<include src="../../login/screen.js"></include> <include src="../../login/screen.js">
<include src="screen_context.js"></include> <include src="screen_context.js">
<include src="../user_images_grid.js"></include> <include src="../user_images_grid.js">
<include src="apps_menu.js"></include> <include src="apps_menu.js">
<include src="../../login/bubble.js"></include> <include src="../../login/bubble.js">
<include src="../../login/display_manager.js"></include> <include src="../../login/display_manager.js">
<include src="header_bar.js"></include> <include src="header_bar.js">
<include src="network_dropdown.js"></include> <include src="network_dropdown.js">
<include src="oobe_screen_reset.js"></include> <include src="oobe_screen_reset.js">
<include src="oobe_screen_autolaunch.js"></include> <include src="oobe_screen_autolaunch.js">
<include src="oobe_screen_enable_kiosk.js"></include> <include src="oobe_screen_enable_kiosk.js">
<include src="oobe_screen_terms_of_service.js"></include> <include src="oobe_screen_terms_of_service.js">
<include src="oobe_screen_user_image.js"></include> <include src="oobe_screen_user_image.js">
<include src="../../login/screen_account_picker.js"></include> <include src="../../login/screen_account_picker.js">
<include src="screen_app_launch_splash.js"></include> <include src="screen_app_launch_splash.js">
<include src="screen_error_message.js"></include> <include src="screen_error_message.js">
<include src="screen_gaia_signin.js"></include> <include src="screen_gaia_signin.js">
<include src="screen_locally_managed_user_creation.js"></include> <include src="screen_locally_managed_user_creation.js">
<include src="screen_password_changed.js"></include> <include src="screen_password_changed.js">
<include src="screen_tpm_error.js"></include> <include src="screen_tpm_error.js">
<include src="screen_wrong_hwid.js"></include> <include src="screen_wrong_hwid.js">
<include src="screen_confirm_password.js"></include> <include src="screen_confirm_password.js">
<include src="screen_fatal_error.js"></include> <include src="screen_fatal_error.js">
<include src="../../login/user_pod_row.js"></include> <include src="../../login/user_pod_row.js">
<include src="../../login/resource_loader.js"></include> <include src="../../login/resource_loader.js">
cr.define('cr.ui', function() { cr.define('cr.ui', function() {
var DisplayManager = cr.ui.login.DisplayManager; var DisplayManager = cr.ui.login.DisplayManager;
......
...@@ -7,14 +7,14 @@ ...@@ -7,14 +7,14 @@
* This is the main code for the OOBE WebUI implementation. * This is the main code for the OOBE WebUI implementation.
*/ */
<include src="login_common.js"></include> <include src="login_common.js">
<include src="oobe_screen_eula.js"></include> <include src="oobe_screen_eula.js">
<include src="oobe_screen_network.js"></include> <include src="oobe_screen_network.js">
<include src="oobe_screen_hid_detection.js"></include> <include src="oobe_screen_hid_detection.js">
<include src="oobe_screen_update.js"></include> <include src="oobe_screen_update.js">
<include src="oobe_screen_controller_pairing.js"></include> <include src="oobe_screen_controller_pairing.js">
<include src="oobe_screen_host_pairing.js"></include> <include src="oobe_screen_host_pairing.js">
<include src="oobe_screen_auto_enrollment_check.js"></include> <include src="oobe_screen_auto_enrollment_check.js">
cr.define('cr.ui.Oobe', function() { cr.define('cr.ui.Oobe', function() {
return { return {
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* @fileoverview Oobe signin screen implementation. * @fileoverview Oobe signin screen implementation.
*/ */
<include src="../../gaia_auth_host/gaia_auth_host.js"></include> <include src="../../gaia_auth_host/gaia_auth_host.js">
login.createScreen('GaiaSigninScreen', 'gaia-signin', function() { login.createScreen('GaiaSigninScreen', 'gaia-signin', function() {
// Gaia loading time after which error message must be displayed and // Gaia loading time after which error message must be displayed and
......
...@@ -143,5 +143,5 @@ cr.define('extensions', function() { ...@@ -143,5 +143,5 @@ cr.define('extensions', function() {
}; };
}); });
<include src="kiosk_app_list.js"></include> <include src="kiosk_app_list.js">
<include src="kiosk_app_disable_bailout_confirm.js"></include> <include src="kiosk_app_disable_bailout_confirm.js">
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
<include src="extension_command_list.js"></include> <include src="extension_command_list.js">
cr.define('extensions', function() { cr.define('extensions', function() {
'use strict'; 'use strict';
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
<include src="extension_error_overlay.js"></include> <include src="extension_error_overlay.js">
cr.define('extensions', function() { cr.define('extensions', function() {
'use strict'; 'use strict';
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
<include src="extension_error.js"></include> <include src="extension_error.js">
cr.define('options', function() { cr.define('options', function() {
'use strict'; 'use strict';
......
...@@ -2,17 +2,17 @@ ...@@ -2,17 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
<include src="../uber/uber_utils.js"></include> <include src="../uber/uber_utils.js">
<include src="extension_code.js"></include> <include src="extension_code.js">
<include src="extension_commands_overlay.js"></include> <include src="extension_commands_overlay.js">
<include src="extension_focus_manager.js"></include> <include src="extension_focus_manager.js">
<include src="extension_list.js"></include> <include src="extension_list.js">
<include src="pack_extension_overlay.js"></include> <include src="pack_extension_overlay.js">
<include src="extension_error_overlay.js"></include> <include src="extension_error_overlay.js">
<include src="extension_loader.js"></include> <include src="extension_loader.js">
<if expr="chromeos"> <if expr="chromeos">
<include src="chromeos/kiosk_apps.js"></include> <include src="chromeos/kiosk_apps.js">
</if> </if>
// Used for observing function of the backend datasource for this page by // Used for observing function of the backend datasource for this page by
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* @fileoverview Inline login UI. * @fileoverview Inline login UI.
*/ */
<include src="../gaia_auth_host/gaia_auth_host.js"></include> <include src="../gaia_auth_host/gaia_auth_host.js">
cr.define('inline.login', function() { cr.define('inline.login', function() {
'use strict'; 'use strict';
......
...@@ -5,41 +5,37 @@ ...@@ -5,41 +5,37 @@
// This file exists to aggregate all of the javascript used by the // This file exists to aggregate all of the javascript used by the
// settings page into a single file which will be flattened and served // settings page into a single file which will be flattened and served
// as a single resource. // as a single resource.
<include src="preferences.js"></include> <include src="preferences.js">
<include src="controlled_setting.js"></include> <include src="controlled_setting.js">
<include src="deletable_item_list.js"></include> <include src="deletable_item_list.js">
<include src="editable_text_field.js"></include> <include src="editable_text_field.js">
<include src="hotword_search_setting_indicator.js"></include> <include src="hotword_search_setting_indicator.js">
<include src="inline_editable_list.js"></include> <include src="inline_editable_list.js">
<include src="options_page.js"></include> <include src="options_page.js">
<include src="pref_ui.js"></include> <include src="pref_ui.js">
<include src="settings_dialog.js"></include> <include src="settings_dialog.js">
<include src="settings_banner.js"></include> <include src="settings_banner.js">
<if expr="chromeos"> <if expr="chromeos">
<include src="../chromeos/user_images_grid.js"></include> <include src="../chromeos/user_images_grid.js">
// DO NOT BREAK THE FOLLOWING INCLUDE LINE INTO SEPARATE LINES! <include src="../../../../ui/webui/resources/js/chromeos/ui_account_tweaks.js">
// Even though the include line spans more than 80 characters, <include src="chromeos/change_picture_options.js">
// The grit html inlining parser will leave the end tag behind, <include src="chromeos/internet_detail_ip_address_field.js">
// causing a runtime JS break. <include src="chromeos/internet_detail.js">
<include src="../../../../ui/webui/resources/js/chromeos/ui_account_tweaks.js"></include> <include src="chromeos/network_list.js">
<include src="chromeos/change_picture_options.js"></include> <include src="chromeos/preferred_networks.js">
<include src="chromeos/internet_detail_ip_address_field.js"></include> <include src="chromeos/bluetooth_device_list.js">
<include src="chromeos/internet_detail.js"></include> <include src="chromeos/bluetooth_add_device_overlay.js">
<include src="chromeos/network_list.js"></include> <include src="chromeos/bluetooth_pair_device_overlay.js">
<include src="chromeos/preferred_networks.js"></include> <include src="chromeos/accounts_options.js">
<include src="chromeos/bluetooth_device_list.js"></include> <include src="chromeos/proxy_rules_list.js">
<include src="chromeos/bluetooth_add_device_overlay.js"></include> <include src="chromeos/accounts_user_list.js">
<include src="chromeos/bluetooth_pair_device_overlay.js"></include> <include src="chromeos/accounts_user_name_edit.js">
<include src="chromeos/accounts_options.js"></include> <include src="chromeos/consumer_management_overlay.js">
<include src="chromeos/proxy_rules_list.js"></include> <include src="chromeos/display_options.js">
<include src="chromeos/accounts_user_list.js"></include> <include src="chromeos/display_overscan.js">
<include src="chromeos/accounts_user_name_edit.js"></include> <include src="chromeos/keyboard_overlay.js">
<include src="chromeos/consumer_management_overlay.js"></include> <include src="chromeos/pointer_overlay.js">
<include src="chromeos/display_options.js"></include> <include src="chromeos/third_party_ime_confirm_overlay.js">
<include src="chromeos/display_overscan.js"></include>
<include src="chromeos/keyboard_overlay.js"></include>
<include src="chromeos/pointer_overlay.js"></include>
<include src="chromeos/third_party_ime_confirm_overlay.js"></include>
var AccountsOptions = options.AccountsOptions; var AccountsOptions = options.AccountsOptions;
var ChangePictureOptions = options.ChangePictureOptions; var ChangePictureOptions = options.ChangePictureOptions;
var ConsumerManagementOverlay = options.ConsumerManagementOverlay; var ConsumerManagementOverlay = options.ConsumerManagementOverlay;
...@@ -53,72 +49,72 @@ var PointerOverlay = options.PointerOverlay; ...@@ -53,72 +49,72 @@ var PointerOverlay = options.PointerOverlay;
var UIAccountTweaks = uiAccountTweaks.UIAccountTweaks; var UIAccountTweaks = uiAccountTweaks.UIAccountTweaks;
</if> </if>
<if expr="use_nss"> <if expr="use_nss">
<include src="certificate_tree.js"></include> <include src="certificate_tree.js">
<include src="certificate_manager.js"></include> <include src="certificate_manager.js">
<include src="certificate_restore_overlay.js"></include> <include src="certificate_restore_overlay.js">
<include src="certificate_backup_overlay.js"></include> <include src="certificate_backup_overlay.js">
<include src="certificate_edit_ca_trust_overlay.js"></include> <include src="certificate_edit_ca_trust_overlay.js">
<include src="certificate_import_error_overlay.js"></include> <include src="certificate_import_error_overlay.js">
var CertificateManager = options.CertificateManager; var CertificateManager = options.CertificateManager;
var CertificateRestoreOverlay = options.CertificateRestoreOverlay; var CertificateRestoreOverlay = options.CertificateRestoreOverlay;
var CertificateBackupOverlay = options.CertificateBackupOverlay; var CertificateBackupOverlay = options.CertificateBackupOverlay;
var CertificateEditCaTrustOverlay = options.CertificateEditCaTrustOverlay; var CertificateEditCaTrustOverlay = options.CertificateEditCaTrustOverlay;
var CertificateImportErrorOverlay = options.CertificateImportErrorOverlay; var CertificateImportErrorOverlay = options.CertificateImportErrorOverlay;
</if> </if>
<include src="alert_overlay.js"></include> <include src="alert_overlay.js">
<include src="autofill_edit_address_overlay.js"></include> <include src="autofill_edit_address_overlay.js">
<include src="autofill_edit_creditcard_overlay.js"></include> <include src="autofill_edit_creditcard_overlay.js">
<include src="autofill_options_list.js"></include> <include src="autofill_options_list.js">
<include src="autofill_options.js"></include> <include src="autofill_options.js">
<include src="automatic_settings_reset_banner.js"></include> <include src="automatic_settings_reset_banner.js">
<include src="browser_options.js"></include> <include src="browser_options.js">
<include src="browser_options_profile_list.js"></include> <include src="browser_options_profile_list.js">
<include src="browser_options_startup_page_list.js"></include> <include src="browser_options_startup_page_list.js">
<include src="clear_browser_data_overlay.js"></include> <include src="clear_browser_data_overlay.js">
<include src="confirm_dialog.js"></include> <include src="confirm_dialog.js">
<include src="content_settings.js"></include> <include src="content_settings.js">
<include src="content_settings_exceptions_area.js"></include> <include src="content_settings_exceptions_area.js">
<include src="content_settings_ui.js"></include> <include src="content_settings_ui.js">
<include src="cookies_list.js"></include> <include src="cookies_list.js">
<include src="cookies_view.js"></include> <include src="cookies_view.js">
<include src="factory_reset_overlay.js"></include> <include src="factory_reset_overlay.js">
<include src="font_settings.js"></include> <include src="font_settings.js">
<if expr="enable_google_now"> <if expr="enable_google_now">
<include src="geolocation_options.js"></include> <include src="geolocation_options.js">
</if> </if>
<include src="handler_options.js"></include> <include src="handler_options.js">
<include src="handler_options_list.js"></include> <include src="handler_options_list.js">
<include src="home_page_overlay.js"></include> <include src="home_page_overlay.js">
<include src="hotword_confirm_dialog.js"></include> <include src="hotword_confirm_dialog.js">
<include src="import_data_overlay.js"></include> <include src="import_data_overlay.js">
<include src="language_add_language_overlay.js"></include> <include src="language_add_language_overlay.js">
<if expr="not is_macosx"> <if expr="not is_macosx">
<include src="language_dictionary_overlay_word_list.js"></include> <include src="language_dictionary_overlay_word_list.js">
<include src="language_dictionary_overlay.js"></include> <include src="language_dictionary_overlay.js">
</if> </if>
<include src="language_list.js"></include> <include src="language_list.js">
<include src="language_options.js"></include> <include src="language_options.js">
<include src="manage_profile_overlay.js"></include> <include src="manage_profile_overlay.js">
<include src="managed_user_create_confirm.js"</include> <include src="managed_user_create_confirm.js">
<include src="managed_user_import.js"></include> <include src="managed_user_import.js">
<include src="managed_user_learn_more.js"</include> <include src="managed_user_learn_more.js">
<include src="managed_user_list.js"></include> <include src="managed_user_list.js">
<include src="managed_user_list_data.js"></include> <include src="managed_user_list_data.js">
<include src="options_focus_manager.js"></include> <include src="options_focus_manager.js">
<include src="origin_resources_list.js"></include> <include src="origin_resources_list.js">
<include src="password_manager.js"></include> <include src="password_manager.js">
<include src="password_manager_list.js"></include> <include src="password_manager_list.js">
<include src="profiles_icon_grid.js"></include> <include src="profiles_icon_grid.js">
<include src="reset_profile_settings_banner.js"></include> <include src="reset_profile_settings_banner.js">
<include src="reset_profile_settings_overlay.js"></include> <include src="reset_profile_settings_overlay.js">
<include src="search_engine_manager.js"></include> <include src="search_engine_manager.js">
<include src="search_engine_manager_engine_list.js"></include> <include src="search_engine_manager_engine_list.js">
<include src="search_page.js"></include> <include src="search_page.js">
<include src="startup_overlay.js"></include> <include src="startup_overlay.js">
<include src="website_settings.js"></include> <include src="website_settings.js">
<include src="../sync_setup_overlay.js"></include> <include src="../sync_setup_overlay.js">
<include src="../uber/uber_utils.js"></include> <include src="../uber/uber_utils.js">
<include src="options.js"></include> <include src="options.js">
<if expr="enable_settings_app"> <if expr="enable_settings_app">
<include src="options_settings_app.js"></include> <include src="options_settings_app.js">
</if> </if>
...@@ -8,5 +8,5 @@ ...@@ -8,5 +8,5 @@
// TODO(bshe): remove this line when polymer supports the configuration. // TODO(bshe): remove this line when polymer supports the configuration.
document.registerElement = undefined; document.registerElement = undefined;
<include src="../../../../third_party/polymer/platform/platform.js"></include> <include src="../../../../third_party/polymer/platform/platform.js">
})(); })();
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
// in an iframe. Iframes can be layered on top of each other, but not mixed in // in an iframe. Iframes can be layered on top of each other, but not mixed in
// with page content, so all overlapping content on uber must be framed. // with page content, so all overlapping content on uber must be framed.
<include src="../../../../ui/webui/resources/js/util.js"></include> <include src="../../../../ui/webui/resources/js/util.js">
<include src="uber_utils.js"></include> <include src="uber_utils.js">
cr.define('uber_frame', function() { cr.define('uber_frame', function() {
......
// Copyright 2013 The Chromium Authors. All rights reserved. // Copyright 2013 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
<include src="../login/screen.js"></include> <include src="../login/screen.js">
<include src="../login/bubble.js"></include> <include src="../login/bubble.js">
<include src="../login/display_manager.js"></include> <include src="../login/display_manager.js">
<include src="control_bar.js"></include> <include src="control_bar.js">
<include src="../login/screen_account_picker.js"></include> <include src="../login/screen_account_picker.js">
<include src="../login/user_pod_row.js"></include> <include src="../login/user_pod_row.js">
<include src="../login/resource_loader.js"></include> <include src="../login/resource_loader.js">
<include src="user_manager_tutorial.js"></include> <include src="user_manager_tutorial.js">
cr.define('cr.ui', function() { cr.define('cr.ui', function() {
var DisplayManager = cr.ui.login.DisplayManager; var DisplayManager = cr.ui.login.DisplayManager;
......
// Copyright 2014 The Chromium Authors. All rights reserved. // Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
<include src="constants.js"></include> <include src="constants.js">
<include src="api_adapter.js"></include> <include src="api_adapter.js">
<include src="touch_fuzzing.js"></include> <include src="touch_fuzzing.js">
<include src="voice_input.js"></include> <include src="voice_input.js">
<include src="main.js"></include> <include src="main.js">
//TODO(kevers): Dynamically load alternative keys based on locale. //TODO(kevers): Dynamically load alternative keys based on locale.
<include src="layouts/latin-accents.js"></include> <include src="layouts/latin-accents.js">
<include src="layouts/symbol-altkeys.js"></include> <include src="layouts/symbol-altkeys.js">
<include src="elements/kb-altkey-container.js"></include> <include src="elements/kb-altkey-container.js">
<include src="elements/kb-altkey-set.js"></include> <include src="elements/kb-altkey-set.js">
<include src="elements/kb-key-codes.js"></include> <include src="elements/kb-key-codes.js">
<include src="elements/kb-key-sequence.js"></include> <include src="elements/kb-key-sequence.js">
<include src="elements/kb-altkey-data.js"></include> <include src="elements/kb-altkey-data.js">
<include src="elements/kb-key-base.js"></include> <include src="elements/kb-key-base.js">
<include src="elements/kb-key.js"></include> <include src="elements/kb-key.js">
<include src="elements/kb-keyset.js"></include> <include src="elements/kb-keyset.js">
<include src="elements/kb-row.js"></include> <include src="elements/kb-row.js">
<include src="elements/kb-altkey.js"></include> <include src="elements/kb-altkey.js">
<include src="elements/kb-keyboard.js"></include> <include src="elements/kb-keyboard.js">
<include src="elements/kb-key-import.js"></include> <include src="elements/kb-key-import.js">
<include src="elements/kb-modifier-key.js"></include> <include src="elements/kb-modifier-key.js">
<include src="elements/kb-shift-key.js"></include> <include src="elements/kb-shift-key.js">
// Copyright 2013 The Chromium Authors. All rights reserved. // Copyright 2013 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
<include src="../../../third_party/polymer/platform/platform.js"></include> <include src="../../../third_party/polymer/platform/platform.js">
<include src="../../../third_party/polymer/polymer/polymer.js"></include> <include src="../../../third_party/polymer/polymer/polymer.js">
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
<include src="./i18n_template_no_process.js"></include> <include src="i18n_template_no_process.js">
i18nTemplate.process(document, loadTimeData); i18nTemplate.process(document, loadTimeData);
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
<include src="../../../../third_party/jstemplate/jstemplate_compiled.js"></include> <include src="../../../../third_party/jstemplate/jstemplate_compiled.js">
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment