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

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

Issue 449623003: Integrate About page into Settings for Chrome OS settings in a window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix tests Created 6 years, 4 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"> 8 <include src="preferences.js">
9 <include src="controlled_setting.js"> 9 <include src="controlled_setting.js">
10 <include src="deletable_item_list.js"> 10 <include src="deletable_item_list.js">
11 <include src="editable_text_field.js"> 11 <include src="editable_text_field.js">
12 <include src="hotword_search_setting_indicator.js"> 12 <include src="hotword_search_setting_indicator.js">
13 <include src="inline_editable_list.js"> 13 <include src="inline_editable_list.js">
14 <include src="options_page.js"> 14 <include src="options_page.js">
15 <include src="pref_ui.js"> 15 <include src="pref_ui.js">
16 <include src="settings_dialog.js"> 16 <include src="settings_dialog.js">
17 <include src="settings_banner.js"> 17 <include src="settings_banner.js">
18 <if expr="chromeos"> 18 <if expr="chromeos">
19 <include src="../chromeos/user_images_grid.js"> 19 <include src="../chromeos/user_images_grid.js">
20 <include src="../help/channel_change_page.js">
21 <include src="../help/help_page.js">
20 <include src="../../../../ui/webui/resources/js/chromeos/ui_account_tweaks.js"> 22 <include src="../../../../ui/webui/resources/js/chromeos/ui_account_tweaks.js">
21 <include src="chromeos/change_picture_options.js"> 23 <include src="chromeos/change_picture_options.js">
22 <include src="chromeos/internet_detail_ip_address_field.js"> 24 <include src="chromeos/internet_detail_ip_address_field.js">
23 <include src="chromeos/internet_detail.js"> 25 <include src="chromeos/internet_detail.js">
24 <include src="chromeos/network_list.js"> 26 <include src="chromeos/network_list.js">
25 <include src="chromeos/preferred_networks.js"> 27 <include src="chromeos/preferred_networks.js">
26 <include src="chromeos/bluetooth_device_list.js"> 28 <include src="chromeos/bluetooth_device_list.js">
27 <include src="chromeos/bluetooth_add_device_overlay.js"> 29 <include src="chromeos/bluetooth_add_device_overlay.js">
28 <include src="chromeos/bluetooth_pair_device_overlay.js"> 30 <include src="chromeos/bluetooth_pair_device_overlay.js">
29 <include src="chromeos/accounts_options.js"> 31 <include src="chromeos/accounts_options.js">
(...skipping 10 matching lines...) Expand all
40 var ChangePictureOptions = options.ChangePictureOptions; 42 var ChangePictureOptions = options.ChangePictureOptions;
41 var ConsumerManagementOverlay = options.ConsumerManagementOverlay; 43 var ConsumerManagementOverlay = options.ConsumerManagementOverlay;
42 var DetailsInternetPage = options.internet.DetailsInternetPage; 44 var DetailsInternetPage = options.internet.DetailsInternetPage;
43 var DisplayOptions = options.DisplayOptions; 45 var DisplayOptions = options.DisplayOptions;
44 var DisplayOverscan = options.DisplayOverscan; 46 var DisplayOverscan = options.DisplayOverscan;
45 var BluetoothOptions = options.BluetoothOptions; 47 var BluetoothOptions = options.BluetoothOptions;
46 var BluetoothPairing = options.BluetoothPairing; 48 var BluetoothPairing = options.BluetoothPairing;
47 var KeyboardOverlay = options.KeyboardOverlay; 49 var KeyboardOverlay = options.KeyboardOverlay;
48 var PointerOverlay = options.PointerOverlay; 50 var PointerOverlay = options.PointerOverlay;
49 var UIAccountTweaks = uiAccountTweaks.UIAccountTweaks; 51 var UIAccountTweaks = uiAccountTweaks.UIAccountTweaks;
52 var HelpPage = help.HelpPage;
53 var ChannelChangePage = help.ChannelChangePage;
Dan Beam 2014/08/13 02:50:46 this is a silly practice and i'd avoid adding more
michaelpg 2014/08/13 08:12:11 Done.
50 </if> 54 </if>
51 <if expr="use_nss"> 55 <if expr="use_nss">
52 <include src="certificate_tree.js"> 56 <include src="certificate_tree.js">
53 <include src="certificate_manager.js"> 57 <include src="certificate_manager.js">
54 <include src="certificate_restore_overlay.js"> 58 <include src="certificate_restore_overlay.js">
55 <include src="certificate_backup_overlay.js"> 59 <include src="certificate_backup_overlay.js">
56 <include src="certificate_edit_ca_trust_overlay.js"> 60 <include src="certificate_edit_ca_trust_overlay.js">
57 <include src="certificate_import_error_overlay.js"> 61 <include src="certificate_import_error_overlay.js">
58 var CertificateManager = options.CertificateManager; 62 var CertificateManager = options.CertificateManager;
59 var CertificateRestoreOverlay = options.CertificateRestoreOverlay; 63 var CertificateRestoreOverlay = options.CertificateRestoreOverlay;
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 <include src="supervised_user_list.js"> 116 <include src="supervised_user_list.js">
113 <include src="supervised_user_list_data.js"> 117 <include src="supervised_user_list_data.js">
114 <include src="website_settings.js"> 118 <include src="website_settings.js">
115 <include src="../sync_setup_overlay.js"> 119 <include src="../sync_setup_overlay.js">
116 <include src="../uber/uber_page_manager_observer.js"> 120 <include src="../uber/uber_page_manager_observer.js">
117 <include src="../uber/uber_utils.js"> 121 <include src="../uber/uber_utils.js">
118 <include src="options.js"> 122 <include src="options.js">
119 <if expr="enable_settings_app"> 123 <if expr="enable_settings_app">
120 <include src="options_settings_app.js"> 124 <include src="options_settings_app.js">
121 </if> 125 </if>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698