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

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

Issue 15966004: cros: Move kiosk settings to extensions page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase and remove temp flag Created 7 years, 6 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"></include> 8 <include src="preferences.js"></include>
9 <include src="controlled_setting.js"></include> 9 <include src="controlled_setting.js"></include>
10 <include src="deletable_item_list.js"></include> 10 <include src="deletable_item_list.js"></include>
(...skipping 13 matching lines...) Expand all
24 <include src="chromeos/bluetooth_device_list.js"></include> 24 <include src="chromeos/bluetooth_device_list.js"></include>
25 <include src="chromeos/bluetooth_add_device_overlay.js"></include> 25 <include src="chromeos/bluetooth_add_device_overlay.js"></include>
26 <include src="chromeos/bluetooth_pair_device_overlay.js"></include> 26 <include src="chromeos/bluetooth_pair_device_overlay.js"></include>
27 <include src="chromeos/accounts_options.js"></include> 27 <include src="chromeos/accounts_options.js"></include>
28 <include src="chromeos/proxy_rules_list.js"></include> 28 <include src="chromeos/proxy_rules_list.js"></include>
29 <include src="chromeos/accounts_user_list.js"></include> 29 <include src="chromeos/accounts_user_list.js"></include>
30 <include src="chromeos/accounts_user_name_edit.js"></include> 30 <include src="chromeos/accounts_user_name_edit.js"></include>
31 <include src="chromeos/display_options.js"></include> 31 <include src="chromeos/display_options.js"></include>
32 <include src="chromeos/display_overscan.js"></include> 32 <include src="chromeos/display_overscan.js"></include>
33 <include src="chromeos/keyboard_overlay.js"></include> 33 <include src="chromeos/keyboard_overlay.js"></include>
34 <include src="chromeos/kiosk_apps.js"></include>
35 <include src="chromeos/pointer_overlay.js"></include> 34 <include src="chromeos/pointer_overlay.js"></include>
36 var AccountsOptions = options.AccountsOptions; 35 var AccountsOptions = options.AccountsOptions;
37 var ChangePictureOptions = options.ChangePictureOptions; 36 var ChangePictureOptions = options.ChangePictureOptions;
38 var DetailsInternetPage = options.internet.DetailsInternetPage; 37 var DetailsInternetPage = options.internet.DetailsInternetPage;
39 var DisplayOptions = options.DisplayOptions; 38 var DisplayOptions = options.DisplayOptions;
40 var DisplayOverscan = options.DisplayOverscan; 39 var DisplayOverscan = options.DisplayOverscan;
41 var BluetoothOptions = options.BluetoothOptions; 40 var BluetoothOptions = options.BluetoothOptions;
42 var BluetoothPairing = options.BluetoothPairing; 41 var BluetoothPairing = options.BluetoothPairing;
43 var KeyboardOverlay = options.KeyboardOverlay; 42 var KeyboardOverlay = options.KeyboardOverlay;
44 var KioskAppsOverlay = options.KioskAppsOverlay;
45 var KioskDisableBailoutConfirm = options.KioskDisableBailoutConfirm;
46 var PointerOverlay = options.PointerOverlay; 43 var PointerOverlay = options.PointerOverlay;
47 var UIAccountTweaks = uiAccountTweaks.UIAccountTweaks; 44 var UIAccountTweaks = uiAccountTweaks.UIAccountTweaks;
48 </if> 45 </if>
49 <if expr="pp_ifdef('use_nss')"> 46 <if expr="pp_ifdef('use_nss')">
50 <include src="certificate_tree.js"></include> 47 <include src="certificate_tree.js"></include>
51 <include src="certificate_manager.js"></include> 48 <include src="certificate_manager.js"></include>
52 <include src="certificate_restore_overlay.js"></include> 49 <include src="certificate_restore_overlay.js"></include>
53 <include src="certificate_backup_overlay.js"></include> 50 <include src="certificate_backup_overlay.js"></include>
54 <include src="certificate_edit_ca_trust_overlay.js"></include> 51 <include src="certificate_edit_ca_trust_overlay.js"></include>
55 <include src="certificate_import_error_overlay.js"></include> 52 <include src="certificate_import_error_overlay.js"></include>
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 <include src="search_engine_manager.js"></include> 97 <include src="search_engine_manager.js"></include>
101 <include src="search_engine_manager_engine_list.js"></include> 98 <include src="search_engine_manager_engine_list.js"></include>
102 <include src="search_page.js"></include> 99 <include src="search_page.js"></include>
103 <include src="startup_overlay.js"></include> 100 <include src="startup_overlay.js"></include>
104 <include src="../sync_setup_overlay.js"></include> 101 <include src="../sync_setup_overlay.js"></include>
105 <include src="../uber/uber_utils.js"></include> 102 <include src="../uber/uber_utils.js"></include>
106 <include src="options.js"></include> 103 <include src="options.js"></include>
107 <if expr="pp_ifdef('enable_settings_app')"> 104 <if expr="pp_ifdef('enable_settings_app')">
108 <include src="options_settings_app.js"></include> 105 <include src="options_settings_app.js"></include>
109 </if> 106 </if>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698