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

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

Issue 677983004: Power overlay in Settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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
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">
(...skipping 20 matching lines...) Expand all
31 <include src="chromeos/accounts_options.js"> 31 <include src="chromeos/accounts_options.js">
32 <include src="chromeos/proxy_rules_list.js"> 32 <include src="chromeos/proxy_rules_list.js">
33 <include src="chromeos/accounts_user_list.js"> 33 <include src="chromeos/accounts_user_list.js">
34 <include src="chromeos/accounts_user_name_edit.js"> 34 <include src="chromeos/accounts_user_name_edit.js">
35 <include src="chromeos/consumer_management_overlay.js"> 35 <include src="chromeos/consumer_management_overlay.js">
36 <include src="chromeos/display_options.js"> 36 <include src="chromeos/display_options.js">
37 <include src="chromeos/display_overscan.js"> 37 <include src="chromeos/display_overscan.js">
38 <include src="chromeos/keyboard_overlay.js"> 38 <include src="chromeos/keyboard_overlay.js">
39 <include src="chromeos/pointer_overlay.js"> 39 <include src="chromeos/pointer_overlay.js">
40 <include src="chromeos/third_party_ime_confirm_overlay.js"> 40 <include src="chromeos/third_party_ime_confirm_overlay.js">
41 <include src="chromeos/power_overlay.js">
41 var AccountsOptions = options.AccountsOptions; 42 var AccountsOptions = options.AccountsOptions;
42 var ChangePictureOptions = options.ChangePictureOptions; 43 var ChangePictureOptions = options.ChangePictureOptions;
43 var ConsumerManagementOverlay = options.ConsumerManagementOverlay; 44 var ConsumerManagementOverlay = options.ConsumerManagementOverlay;
44 var DetailsInternetPage = options.internet.DetailsInternetPage; 45 var DetailsInternetPage = options.internet.DetailsInternetPage;
45 var DisplayOptions = options.DisplayOptions; 46 var DisplayOptions = options.DisplayOptions;
46 var DisplayOverscan = options.DisplayOverscan; 47 var DisplayOverscan = options.DisplayOverscan;
47 var BluetoothOptions = options.BluetoothOptions; 48 var BluetoothOptions = options.BluetoothOptions;
48 var BluetoothPairing = options.BluetoothPairing; 49 var BluetoothPairing = options.BluetoothPairing;
49 var KeyboardOverlay = options.KeyboardOverlay; 50 var KeyboardOverlay = options.KeyboardOverlay;
50 var PointerOverlay = options.PointerOverlay; 51 var PointerOverlay = options.PointerOverlay;
52 var PowerOverlay = options.PowerOverlay;
51 var UIAccountTweaks = uiAccountTweaks.UIAccountTweaks; 53 var UIAccountTweaks = uiAccountTweaks.UIAccountTweaks;
52 </if> 54 </if>
53 <if expr="use_nss"> 55 <if expr="use_nss">
54 <include src="certificate_tree.js"> 56 <include src="certificate_tree.js">
55 <include src="certificate_manager.js"> 57 <include src="certificate_manager.js">
56 <include src="certificate_restore_overlay.js"> 58 <include src="certificate_restore_overlay.js">
57 <include src="certificate_backup_overlay.js"> 59 <include src="certificate_backup_overlay.js">
58 <include src="certificate_edit_ca_trust_overlay.js"> 60 <include src="certificate_edit_ca_trust_overlay.js">
59 <include src="certificate_import_error_overlay.js"> 61 <include src="certificate_import_error_overlay.js">
60 var CertificateManager = options.CertificateManager; 62 var CertificateManager = options.CertificateManager;
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 <include src="website_settings.js"> 119 <include src="website_settings.js">
118 <include src="website_settings_edit_page.js"> 120 <include src="website_settings_edit_page.js">
119 <include src="../help/help_page.js"> 121 <include src="../help/help_page.js">
120 <include src="../sync_setup_overlay.js"> 122 <include src="../sync_setup_overlay.js">
121 <include src="../uber/uber_page_manager_observer.js"> 123 <include src="../uber/uber_page_manager_observer.js">
122 <include src="../uber/uber_utils.js"> 124 <include src="../uber/uber_utils.js">
123 <include src="options.js"> 125 <include src="options.js">
124 <if expr="enable_settings_app"> 126 <if expr="enable_settings_app">
125 <include src="options_settings_app.js"> 127 <include src="options_settings_app.js">
126 </if> 128 </if>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/options.js ('k') | chrome/browser/ui/webui/options/browser_options_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698