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

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

Issue 2009543002: Add storage manager overlay on Settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review comments Created 4 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
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 21 matching lines...) Expand all
32 <include src="chromeos/accounts_user_list.js"> 32 <include src="chromeos/accounts_user_list.js">
33 <include src="chromeos/accounts_user_name_edit.js"> 33 <include src="chromeos/accounts_user_name_edit.js">
34 <include src="chromeos/consumer_management_overlay.js"> 34 <include src="chromeos/consumer_management_overlay.js">
35 <include src="chromeos/display_layout.js"> 35 <include src="chromeos/display_layout.js">
36 <include src="chromeos/display_layout_manager.js"> 36 <include src="chromeos/display_layout_manager.js">
37 <include src="chromeos/display_layout_manager_multi.js"> 37 <include src="chromeos/display_layout_manager_multi.js">
38 <include src="chromeos/display_options.js"> 38 <include src="chromeos/display_options.js">
39 <include src="chromeos/display_overscan.js"> 39 <include src="chromeos/display_overscan.js">
40 <include src="chromeos/keyboard_overlay.js"> 40 <include src="chromeos/keyboard_overlay.js">
41 <include src="chromeos/pointer_overlay.js"> 41 <include src="chromeos/pointer_overlay.js">
42 <include src="chromeos/storage_manager.js">
42 <include src="chromeos/third_party_ime_confirm_overlay.js"> 43 <include src="chromeos/third_party_ime_confirm_overlay.js">
43 <include src="chromeos/power_overlay.js"> 44 <include src="chromeos/power_overlay.js">
44 var AccountsOptions = options.AccountsOptions; 45 var AccountsOptions = options.AccountsOptions;
45 var ChangePictureOptions = options.ChangePictureOptions; 46 var ChangePictureOptions = options.ChangePictureOptions;
46 var ConsumerManagementOverlay = options.ConsumerManagementOverlay; 47 var ConsumerManagementOverlay = options.ConsumerManagementOverlay;
47 var DetailsInternetPage = options.internet.DetailsInternetPage; 48 var DetailsInternetPage = options.internet.DetailsInternetPage;
48 var DisplayOptions = options.DisplayOptions; 49 var DisplayOptions = options.DisplayOptions;
49 var DisplayOverscan = options.DisplayOverscan; 50 var DisplayOverscan = options.DisplayOverscan;
50 var BluetoothOptions = options.BluetoothOptions; 51 var BluetoothOptions = options.BluetoothOptions;
51 var BluetoothPairing = options.BluetoothPairing; 52 var BluetoothPairing = options.BluetoothPairing;
52 var KeyboardOverlay = options.KeyboardOverlay; 53 var KeyboardOverlay = options.KeyboardOverlay;
53 var PointerOverlay = options.PointerOverlay; 54 var PointerOverlay = options.PointerOverlay;
54 var PowerOverlay = options.PowerOverlay; 55 var PowerOverlay = options.PowerOverlay;
56 var StorageManager = options.StorageManager;
55 var UIAccountTweaks = uiAccountTweaks.UIAccountTweaks; 57 var UIAccountTweaks = uiAccountTweaks.UIAccountTweaks;
56 </if> 58 </if>
57 <if expr="use_nss_certs"> 59 <if expr="use_nss_certs">
58 <include src="certificate_tree.js"> 60 <include src="certificate_tree.js">
59 <include src="certificate_manager.js"> 61 <include src="certificate_manager.js">
60 <include src="certificate_restore_overlay.js"> 62 <include src="certificate_restore_overlay.js">
61 <include src="certificate_backup_overlay.js"> 63 <include src="certificate_backup_overlay.js">
62 <include src="certificate_edit_ca_trust_overlay.js"> 64 <include src="certificate_edit_ca_trust_overlay.js">
63 <include src="certificate_import_error_overlay.js"> 65 <include src="certificate_import_error_overlay.js">
64 var CertificateManager = options.CertificateManager; 66 var CertificateManager = options.CertificateManager;
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 <include src="sync_setup_overlay.js"> 123 <include src="sync_setup_overlay.js">
122 <if expr="is_win"> 124 <if expr="is_win">
123 <include src="triggered_reset_profile_settings_overlay.js"> 125 <include src="triggered_reset_profile_settings_overlay.js">
124 </if> 126 </if>
125 <include src="../uber/uber_page_manager_observer.js"> 127 <include src="../uber/uber_page_manager_observer.js">
126 <include src="../uber/uber_utils.js"> 128 <include src="../uber/uber_utils.js">
127 <include src="options.js"> 129 <include src="options.js">
128 <if expr="enable_settings_app"> 130 <if expr="enable_settings_app">
129 <include src="options_settings_app.js"> 131 <include src="options_settings_app.js">
130 </if> 132 </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