| OLD | NEW | 
|---|
| 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="controlled_setting.js"></include> | 8 <include src="controlled_setting.js"></include> | 
| 9 <include src="deletable_item_list.js"></include> | 9 <include src="deletable_item_list.js"></include> | 
| 10 <include src="inline_editable_list.js"></include> | 10 <include src="inline_editable_list.js"></include> | 
| (...skipping 10 matching lines...) Expand all  Loading... | 
| 21   <include src="chromeos/internet_detail.js"></include> | 21   <include src="chromeos/internet_detail.js"></include> | 
| 22   <include src="chromeos/network_list.js"></include> | 22   <include src="chromeos/network_list.js"></include> | 
| 23   <include src="chromeos/preferred_networks.js"></include> | 23   <include src="chromeos/preferred_networks.js"></include> | 
| 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/keyboard_overlay.js"></include> | 32   <include src="chromeos/keyboard_overlay.js"></include> | 
| 32   <include src="chromeos/pointer_overlay.js"></include> | 33   <include src="chromeos/pointer_overlay.js"></include> | 
| 33   var AccountsOptions = options.AccountsOptions; | 34   var AccountsOptions = options.AccountsOptions; | 
| 34   var ChangePictureOptions = options.ChangePictureOptions; | 35   var ChangePictureOptions = options.ChangePictureOptions; | 
| 35   var DetailsInternetPage = options.internet.DetailsInternetPage; | 36   var DetailsInternetPage = options.internet.DetailsInternetPage; | 
|  | 37   var DisplayOptions = options.DisplayOptions; | 
| 36   var BluetoothOptions = options.BluetoothOptions; | 38   var BluetoothOptions = options.BluetoothOptions; | 
| 37   var BluetoothPairing = options.BluetoothPairing; | 39   var BluetoothPairing = options.BluetoothPairing; | 
| 38   var KeyboardOverlay = options.KeyboardOverlay; | 40   var KeyboardOverlay = options.KeyboardOverlay; | 
| 39   var PointerOverlay = options.PointerOverlay; | 41   var PointerOverlay = options.PointerOverlay; | 
| 40   var UIAccountTweaks = uiAccountTweaks.UIAccountTweaks; | 42   var UIAccountTweaks = uiAccountTweaks.UIAccountTweaks; | 
| 41 </if> | 43 </if> | 
| 42 <if expr="pp_ifdef('chromeos') and pp_ifdef('use_ash')"> | 44 <if expr="pp_ifdef('chromeos') and pp_ifdef('use_ash')"> | 
| 43   <include src="chromeos/set_wallpaper_options.js"></include> | 45   <include src="chromeos/set_wallpaper_options.js"></include> | 
| 44   var SetWallpaperOptions = options.SetWallpaperOptions; | 46   var SetWallpaperOptions = options.SetWallpaperOptions; | 
| 45 </if> | 47 </if> | 
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 86 <include src="profiles_icon_grid.js"></include> | 88 <include src="profiles_icon_grid.js"></include> | 
| 87 <include src="search_engine_manager.js"></include> | 89 <include src="search_engine_manager.js"></include> | 
| 88 <include src="search_engine_manager_engine_list.js"></include> | 90 <include src="search_engine_manager_engine_list.js"></include> | 
| 89 <include src="search_page.js"></include> | 91 <include src="search_page.js"></include> | 
| 90 <include src="session_restore_overlay.js"></include> | 92 <include src="session_restore_overlay.js"></include> | 
| 91 <include src="spelling_confirm_overlay.js"></include> | 93 <include src="spelling_confirm_overlay.js"></include> | 
| 92 <include src="startup_overlay.js"></include> | 94 <include src="startup_overlay.js"></include> | 
| 93 <include src="../sync_setup_overlay.js"></include> | 95 <include src="../sync_setup_overlay.js"></include> | 
| 94 <include src="../uber/uber_utils.js"></include> | 96 <include src="../uber/uber_utils.js"></include> | 
| 95 <include src="options.js"></include> | 97 <include src="options.js"></include> | 
| OLD | NEW | 
|---|