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

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

Issue 2188033005: Add note page to options. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@stylus-settings
Patch Set: Initial upload Created 4 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
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/proxy_rules_list.js"> 31 <include src="chromeos/proxy_rules_list.js">
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/note_overlay.js">
41 <include src="chromeos/pointer_overlay.js"> 42 <include src="chromeos/pointer_overlay.js">
42 <include src="chromeos/storage_clear_drive_cache_overlay.js"> 43 <include src="chromeos/storage_clear_drive_cache_overlay.js">
43 <include src="chromeos/storage_manager.js"> 44 <include src="chromeos/storage_manager.js">
44 <include src="chromeos/third_party_ime_confirm_overlay.js"> 45 <include src="chromeos/third_party_ime_confirm_overlay.js">
45 <include src="chromeos/power_overlay.js"> 46 <include src="chromeos/power_overlay.js">
46 var AccountsOptions = options.AccountsOptions; 47 var AccountsOptions = options.AccountsOptions;
47 var ChangePictureOptions = options.ChangePictureOptions; 48 var ChangePictureOptions = options.ChangePictureOptions;
48 var ConsumerManagementOverlay = options.ConsumerManagementOverlay; 49 var ConsumerManagementOverlay = options.ConsumerManagementOverlay;
49 var DetailsInternetPage = options.internet.DetailsInternetPage; 50 var DetailsInternetPage = options.internet.DetailsInternetPage;
50 var DisplayOptions = options.DisplayOptions; 51 var DisplayOptions = options.DisplayOptions;
51 var DisplayOverscan = options.DisplayOverscan; 52 var DisplayOverscan = options.DisplayOverscan;
52 var BluetoothOptions = options.BluetoothOptions; 53 var BluetoothOptions = options.BluetoothOptions;
53 var BluetoothPairing = options.BluetoothPairing; 54 var BluetoothPairing = options.BluetoothPairing;
54 var KeyboardOverlay = options.KeyboardOverlay; 55 var KeyboardOverlay = options.KeyboardOverlay;
56 var NoteOverlay = options.NoteOverlay;
55 var PointerOverlay = options.PointerOverlay; 57 var PointerOverlay = options.PointerOverlay;
56 var PowerOverlay = options.PowerOverlay; 58 var PowerOverlay = options.PowerOverlay;
57 var StorageClearDriveCacheOverlay = options.StorageClearDriveCacheOverlay; 59 var StorageClearDriveCacheOverlay = options.StorageClearDriveCacheOverlay;
58 var StorageManager = options.StorageManager; 60 var StorageManager = options.StorageManager;
59 var UIAccountTweaks = uiAccountTweaks.UIAccountTweaks; 61 var UIAccountTweaks = uiAccountTweaks.UIAccountTweaks;
60 </if> 62 </if>
61 <if expr="use_nss_certs"> 63 <if expr="use_nss_certs">
62 <include src="certificate_tree.js"> 64 <include src="certificate_tree.js">
63 <include src="certificate_manager.js"> 65 <include src="certificate_manager.js">
64 <include src="certificate_restore_overlay.js"> 66 <include src="certificate_restore_overlay.js">
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 <include src="supervised_user_list.js"> 124 <include src="supervised_user_list.js">
123 <include src="supervised_user_list_data.js"> 125 <include src="supervised_user_list_data.js">
124 <include src="../help/help_page.js"> 126 <include src="../help/help_page.js">
125 <include src="sync_setup_overlay.js"> 127 <include src="sync_setup_overlay.js">
126 <if expr="is_win"> 128 <if expr="is_win">
127 <include src="triggered_reset_profile_settings_overlay.js"> 129 <include src="triggered_reset_profile_settings_overlay.js">
128 </if> 130 </if>
129 <include src="../uber/uber_page_manager_observer.js"> 131 <include src="../uber/uber_page_manager_observer.js">
130 <include src="../uber/uber_utils.js"> 132 <include src="../uber/uber_utils.js">
131 <include src="options.js"> 133 <include src="options.js">
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/options.js ('k') | chrome/browser/ui/webui/options/chromeos/options_note_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698