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

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: rebase 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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 <include src="supervised_user_list.js"> 114 <include src="supervised_user_list.js">
113 <include src="supervised_user_list_data.js"> 115 <include src="supervised_user_list_data.js">
114 <include src="website_settings.js"> 116 <include src="website_settings.js">
115 <include src="../sync_setup_overlay.js"> 117 <include src="../sync_setup_overlay.js">
116 <include src="../uber/uber_page_manager_observer.js"> 118 <include src="../uber/uber_page_manager_observer.js">
117 <include src="../uber/uber_utils.js"> 119 <include src="../uber/uber_utils.js">
118 <include src="options.js"> 120 <include src="options.js">
119 <if expr="enable_settings_app"> 121 <if expr="enable_settings_app">
120 <include src="options_settings_app.js"> 122 <include src="options_settings_app.js">
121 </if> 123 </if>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/options.js ('k') | chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698