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

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

Issue 9147054: Revert 117136 - separate about page into its own page (included in chrome://chrome) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
« no previous file with comments | « chrome/browser/resources/options2/options.js ('k') | chrome/browser/resources/uber/uber.css » ('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"></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>
11 <include src="inline_editable_list.js"></include> 11 <include src="inline_editable_list.js"></include>
12 <include src="controlled_setting.js"></include> 12 <include src="controlled_setting.js"></include>
13 <include src="options_page.js"></include> 13 <include src="options_page.js"></include>
14 <if expr="pp_ifdef('chromeos')"> 14 <if expr="pp_ifdef('chromeos')">
15 <include src="about_page.js"></include>
15 <include src="../chromeos/user_images_grid.js"></include> 16 <include src="../chromeos/user_images_grid.js"></include>
16 <include src="chromeos/cellular_plan_element.js"></include> 17 <include src="chromeos/cellular_plan_element.js"></include>
17 <include src="chromeos/change_picture_options.js"></include> 18 <include src="chromeos/change_picture_options.js"></include>
18 <include src="chromeos/internet_detail_ip_config_list.js"></include> 19 <include src="chromeos/internet_detail_ip_config_list.js"></include>
19 <include src="chromeos/internet_network_element.js"></include> 20 <include src="chromeos/internet_network_element.js"></include>
20 <include src="chromeos/internet_options.js"></include> 21 <include src="chromeos/internet_options.js"></include>
21 <include src="chromeos/internet_detail.js"></include> 22 <include src="chromeos/internet_detail.js"></include>
22 <include src="chromeos/system_options.js"></include> 23 <include src="chromeos/system_options.js"></include>
23 <include src="chromeos/bluetooth_device_list.js"></include> 24 <include src="chromeos/bluetooth_device_list.js"></include>
24 <include src="chromeos/bluetooth_add_device_overlay.js"></include> 25 <include src="chromeos/bluetooth_add_device_overlay.js"></include>
25 <include src="chromeos/bluetooth_pair_device_overlay.js"></include> 26 <include src="chromeos/bluetooth_pair_device_overlay.js"></include>
26 <include src="chromeos/accounts_options.js"></include> 27 <include src="chromeos/accounts_options.js"></include>
27 <include src="chromeos/proxy_options.js"></include> 28 <include src="chromeos/proxy_options.js"></include>
28 <include src="chromeos/proxy_rules_list.js"></include> 29 <include src="chromeos/proxy_rules_list.js"></include>
29 <include src="chromeos/accounts_user_list.js"></include> 30 <include src="chromeos/accounts_user_list.js"></include>
30 <include src="chromeos/accounts_user_name_edit.js"></include> 31 <include src="chromeos/accounts_user_name_edit.js"></include>
31 <include src="chromeos/virtual_keyboard.js"></include> 32 <include src="chromeos/virtual_keyboard.js"></include>
32 <include src="chromeos/virtual_keyboard_list.js"></include> 33 <include src="chromeos/virtual_keyboard_list.js"></include>
34 var AboutPage = options.AboutPage;
33 var AccountsOptions = options.AccountsOptions; 35 var AccountsOptions = options.AccountsOptions;
34 var ChangePictureOptions = options.ChangePictureOptions; 36 var ChangePictureOptions = options.ChangePictureOptions;
35 var InternetOptions = options.InternetOptions; 37 var InternetOptions = options.InternetOptions;
36 var DetailsInternetPage = options.internet.DetailsInternetPage; 38 var DetailsInternetPage = options.internet.DetailsInternetPage;
37 var SystemOptions = options.SystemOptions; 39 var SystemOptions = options.SystemOptions;
38 var BluetoothOptions = options.BluetoothOptions; 40 var BluetoothOptions = options.BluetoothOptions;
39 var BluetoothPairing = options.BluetoothPairing; 41 var BluetoothPairing = options.BluetoothPairing;
40 </if> 42 </if>
41 <if expr="not pp_ifdef('win32') and not pp_ifdef('darwin')"> 43 <if expr="not pp_ifdef('win32') and not pp_ifdef('darwin')">
42 <include src="certificate_tree.js"></include> 44 <include src="certificate_tree.js"></include>
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 <include src="password_manager_list.js"></include> 88 <include src="password_manager_list.js"></include>
87 <include src="personal_options.js"></include> 89 <include src="personal_options.js"></include>
88 <include src="personal_options_profile_list.js"></include> 90 <include src="personal_options_profile_list.js"></include>
89 <include src="profiles_icon_grid.js"></include> 91 <include src="profiles_icon_grid.js"></include>
90 <include src="search_engine_manager.js"></include> 92 <include src="search_engine_manager.js"></include>
91 <include src="search_engine_manager_engine_list.js"></include> 93 <include src="search_engine_manager_engine_list.js"></include>
92 <include src="search_page.js"></include> 94 <include src="search_page.js"></include>
93 <include src="startup_overlay.js"></include> 95 <include src="startup_overlay.js"></include>
94 <include src="../sync_setup_overlay.js"></include> 96 <include src="../sync_setup_overlay.js"></include>
95 <include src="options.js"></include> 97 <include src="options.js"></include>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options2/options.js ('k') | chrome/browser/resources/uber/uber.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698