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

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

Issue 325633003: Add confirmation dialog when enabling a 3rd party IME. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nits. Created 6 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 | Annotate | Revision Log
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"></include> 8 <include src="preferences.js"></include>
9 <include src="controlled_setting.js"></include> 9 <include src="controlled_setting.js"></include>
10 <include src="deletable_item_list.js"></include> 10 <include src="deletable_item_list.js"></include>
(...skipping 20 matching lines...) Expand all
31 <include src="chromeos/bluetooth_add_device_overlay.js"></include> 31 <include src="chromeos/bluetooth_add_device_overlay.js"></include>
32 <include src="chromeos/bluetooth_pair_device_overlay.js"></include> 32 <include src="chromeos/bluetooth_pair_device_overlay.js"></include>
33 <include src="chromeos/accounts_options.js"></include> 33 <include src="chromeos/accounts_options.js"></include>
34 <include src="chromeos/proxy_rules_list.js"></include> 34 <include src="chromeos/proxy_rules_list.js"></include>
35 <include src="chromeos/accounts_user_list.js"></include> 35 <include src="chromeos/accounts_user_list.js"></include>
36 <include src="chromeos/accounts_user_name_edit.js"></include> 36 <include src="chromeos/accounts_user_name_edit.js"></include>
37 <include src="chromeos/display_options.js"></include> 37 <include src="chromeos/display_options.js"></include>
38 <include src="chromeos/display_overscan.js"></include> 38 <include src="chromeos/display_overscan.js"></include>
39 <include src="chromeos/keyboard_overlay.js"></include> 39 <include src="chromeos/keyboard_overlay.js"></include>
40 <include src="chromeos/pointer_overlay.js"></include> 40 <include src="chromeos/pointer_overlay.js"></include>
41 <include src="chromeos/third_party_ime_confirm_overlay.js"></include>
41 var AccountsOptions = options.AccountsOptions; 42 var AccountsOptions = options.AccountsOptions;
42 var ChangePictureOptions = options.ChangePictureOptions; 43 var ChangePictureOptions = options.ChangePictureOptions;
43 var DetailsInternetPage = options.internet.DetailsInternetPage; 44 var DetailsInternetPage = options.internet.DetailsInternetPage;
44 var DisplayOptions = options.DisplayOptions; 45 var DisplayOptions = options.DisplayOptions;
45 var DisplayOverscan = options.DisplayOverscan; 46 var DisplayOverscan = options.DisplayOverscan;
46 var BluetoothOptions = options.BluetoothOptions; 47 var BluetoothOptions = options.BluetoothOptions;
47 var BluetoothPairing = options.BluetoothPairing; 48 var BluetoothPairing = options.BluetoothPairing;
48 var KeyboardOverlay = options.KeyboardOverlay; 49 var KeyboardOverlay = options.KeyboardOverlay;
49 var PointerOverlay = options.PointerOverlay; 50 var PointerOverlay = options.PointerOverlay;
50 var UIAccountTweaks = uiAccountTweaks.UIAccountTweaks; 51 var UIAccountTweaks = uiAccountTweaks.UIAccountTweaks;
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 <include src="search_engine_manager.js"></include> 110 <include src="search_engine_manager.js"></include>
110 <include src="search_engine_manager_engine_list.js"></include> 111 <include src="search_engine_manager_engine_list.js"></include>
111 <include src="search_page.js"></include> 112 <include src="search_page.js"></include>
112 <include src="startup_overlay.js"></include> 113 <include src="startup_overlay.js"></include>
113 <include src="../sync_setup_overlay.js"></include> 114 <include src="../sync_setup_overlay.js"></include>
114 <include src="../uber/uber_utils.js"></include> 115 <include src="../uber/uber_utils.js"></include>
115 <include src="options.js"></include> 116 <include src="options.js"></include>
116 <if expr="enable_settings_app"> 117 <if expr="enable_settings_app">
117 <include src="options_settings_app.js"></include> 118 <include src="options_settings_app.js"></include>
118 </if> 119 </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