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

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

Issue 1649173002: Add DisplayLayoutManagerMulti (WIP) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_576375_display3e
Patch Set: Rebase Created 4 years, 10 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
« no previous file with comments | « chrome/browser/resources/options/chromeos/display_options.js ('k') | no next file » | 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"> 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 15 matching lines...) Expand all
26 <include src="chromeos/preferred_networks.js"> 26 <include src="chromeos/preferred_networks.js">
27 <include src="chromeos/bluetooth_device_list.js"> 27 <include src="chromeos/bluetooth_device_list.js">
28 <include src="chromeos/bluetooth_add_device_overlay.js"> 28 <include src="chromeos/bluetooth_add_device_overlay.js">
29 <include src="chromeos/bluetooth_pair_device_overlay.js"> 29 <include src="chromeos/bluetooth_pair_device_overlay.js">
30 <include src="chromeos/accounts_options.js"> 30 <include src="chromeos/accounts_options.js">
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_manager.js"> 35 <include src="chromeos/display_layout_manager.js">
36 <include src="chromeos/display_layout_manager_multi.js">
36 <include src="chromeos/display_options.js"> 37 <include src="chromeos/display_options.js">
37 <include src="chromeos/display_overscan.js"> 38 <include src="chromeos/display_overscan.js">
38 <include src="chromeos/keyboard_overlay.js"> 39 <include src="chromeos/keyboard_overlay.js">
39 <include src="chromeos/pointer_overlay.js"> 40 <include src="chromeos/pointer_overlay.js">
40 <include src="chromeos/third_party_ime_confirm_overlay.js"> 41 <include src="chromeos/third_party_ime_confirm_overlay.js">
41 <include src="chromeos/power_overlay.js"> 42 <include src="chromeos/power_overlay.js">
42 var AccountsOptions = options.AccountsOptions; 43 var AccountsOptions = options.AccountsOptions;
43 var ChangePictureOptions = options.ChangePictureOptions; 44 var ChangePictureOptions = options.ChangePictureOptions;
44 var ConsumerManagementOverlay = options.ConsumerManagementOverlay; 45 var ConsumerManagementOverlay = options.ConsumerManagementOverlay;
45 var DetailsInternetPage = options.internet.DetailsInternetPage; 46 var DetailsInternetPage = options.internet.DetailsInternetPage;
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 <include src="sync_setup_overlay.js"> 119 <include src="sync_setup_overlay.js">
119 <if expr="is_win"> 120 <if expr="is_win">
120 <include src="triggered_reset_profile_settings_overlay.js"> 121 <include src="triggered_reset_profile_settings_overlay.js">
121 </if> 122 </if>
122 <include src="../uber/uber_page_manager_observer.js"> 123 <include src="../uber/uber_page_manager_observer.js">
123 <include src="../uber/uber_utils.js"> 124 <include src="../uber/uber_utils.js">
124 <include src="options.js"> 125 <include src="options.js">
125 <if expr="enable_settings_app"> 126 <if expr="enable_settings_app">
126 <include src="options_settings_app.js"> 127 <include src="options_settings_app.js">
127 </if> 128 </if>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/chromeos/display_options.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698