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

Side by Side Diff: chrome/browser/chromeos/preferences.cc

Issue 23548006: Remove IME related configuration preferences in Chrome OS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unnecessary comments. Created 7 years, 3 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 #include "chrome/browser/chromeos/preferences.h" 5 #include "chrome/browser/chromeos/preferences.h"
6 6
7 #include "ash/magnifier/magnifier_constants.h" 7 #include "ash/magnifier/magnifier_constants.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "base/chromeos/chromeos_version.h" 9 #include "base/chromeos/chromeos_version.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 kFallbackInputMethodLocale, 204 kFallbackInputMethodLocale,
205 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 205 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
206 registry->RegisterStringPref( 206 registry->RegisterStringPref(
207 prefs::kLanguagePreloadEngines, 207 prefs::kLanguagePreloadEngines,
208 hardware_keyboard_id, 208 hardware_keyboard_id,
209 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 209 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
210 registry->RegisterStringPref( 210 registry->RegisterStringPref(
211 prefs::kLanguageEnabledExtensionImes, 211 prefs::kLanguageEnabledExtensionImes,
212 "", 212 "",
213 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 213 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
214 for (size_t i = 0; i < language_prefs::kNumChewingBooleanPrefs; ++i) {
215 registry->RegisterBooleanPref(
216 language_prefs::kChewingBooleanPrefs[i].pref_name,
217 language_prefs::kChewingBooleanPrefs[i].default_pref_value,
218 language_prefs::kChewingBooleanPrefs[i].sync_status);
219 }
220 for (size_t i = 0; i < language_prefs::kNumChewingMultipleChoicePrefs; ++i) {
221 registry->RegisterStringPref(
222 language_prefs::kChewingMultipleChoicePrefs[i].pref_name,
223 language_prefs::kChewingMultipleChoicePrefs[i].default_pref_value,
224 language_prefs::kChewingMultipleChoicePrefs[i].sync_status);
225 }
226 registry->RegisterIntegerPref(
227 language_prefs::kChewingHsuSelKeyType.pref_name,
228 language_prefs::kChewingHsuSelKeyType.default_pref_value,
229 language_prefs::kChewingHsuSelKeyType.sync_status);
230 214
231 for (size_t i = 0; i < language_prefs::kNumChewingIntegerPrefs; ++i) {
232 registry->RegisterIntegerPref(
233 language_prefs::kChewingIntegerPrefs[i].pref_name,
234 language_prefs::kChewingIntegerPrefs[i].default_pref_value,
235 language_prefs::kChewingIntegerPrefs[i].sync_status);
236 }
237 registry->RegisterStringPref(
238 prefs::kLanguageHangulKeyboard,
239 language_prefs::kHangulKeyboardNameIDPairs[0].keyboard_id,
240 user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
241 registry->RegisterStringPref(
242 prefs::kLanguageHangulHanjaBindingKeys,
243 language_prefs::kHangulHanjaBindingKeys,
244 // Don't sync the pref as it's not user-configurable
245 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
246 for (size_t i = 0; i < language_prefs::kNumPinyinBooleanPrefs; ++i) {
247 registry->RegisterBooleanPref(
248 language_prefs::kPinyinBooleanPrefs[i].pref_name,
249 language_prefs::kPinyinBooleanPrefs[i].default_pref_value,
250 language_prefs::kPinyinBooleanPrefs[i].sync_status);
251 }
252 for (size_t i = 0; i < language_prefs::kNumPinyinIntegerPrefs; ++i) {
253 registry->RegisterIntegerPref(
254 language_prefs::kPinyinIntegerPrefs[i].pref_name,
255 language_prefs::kPinyinIntegerPrefs[i].default_pref_value,
256 language_prefs::kPinyinIntegerPrefs[i].sync_status);
257 }
258 registry->RegisterIntegerPref(
259 language_prefs::kPinyinDoublePinyinSchema.pref_name,
260 language_prefs::kPinyinDoublePinyinSchema.default_pref_value,
261 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
262
263 for (size_t i = 0; i < language_prefs::kNumMozcBooleanPrefs; ++i) {
264 registry->RegisterBooleanPref(
265 language_prefs::kMozcBooleanPrefs[i].pref_name,
266 language_prefs::kMozcBooleanPrefs[i].default_pref_value,
267 language_prefs::kMozcBooleanPrefs[i].sync_status);
268 }
269 for (size_t i = 0; i < language_prefs::kNumMozcMultipleChoicePrefs; ++i) {
270 registry->RegisterStringPref(
271 language_prefs::kMozcMultipleChoicePrefs[i].pref_name,
272 language_prefs::kMozcMultipleChoicePrefs[i].default_pref_value,
273 language_prefs::kMozcMultipleChoicePrefs[i].sync_status);
274 }
275 for (size_t i = 0; i < language_prefs::kNumMozcIntegerPrefs; ++i) {
276 registry->RegisterIntegerPref(
277 language_prefs::kMozcIntegerPrefs[i].pref_name,
278 language_prefs::kMozcIntegerPrefs[i].default_pref_value,
279 language_prefs::kMozcIntegerPrefs[i].sync_status);
280 }
281 registry->RegisterIntegerPref( 215 registry->RegisterIntegerPref(
282 prefs::kLanguageRemapSearchKeyTo, 216 prefs::kLanguageRemapSearchKeyTo,
283 input_method::kSearchKey, 217 input_method::kSearchKey,
284 user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF); 218 user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
285 registry->RegisterIntegerPref( 219 registry->RegisterIntegerPref(
286 prefs::kLanguageRemapControlKeyTo, 220 prefs::kLanguageRemapControlKeyTo,
287 input_method::kControlKey, 221 input_method::kControlKey,
288 user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF); 222 user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
289 registry->RegisterIntegerPref( 223 registry->RegisterIntegerPref(
290 prefs::kLanguageRemapAltKeyTo, 224 prefs::kLanguageRemapAltKeyTo,
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 preferred_languages_.Init(prefs::kLanguagePreferredLanguages, 334 preferred_languages_.Init(prefs::kLanguagePreferredLanguages,
401 prefs, callback); 335 prefs, callback);
402 preload_engines_.Init(prefs::kLanguagePreloadEngines, prefs, callback); 336 preload_engines_.Init(prefs::kLanguagePreloadEngines, prefs, callback);
403 enabled_extension_imes_.Init(prefs::kLanguageEnabledExtensionImes, 337 enabled_extension_imes_.Init(prefs::kLanguageEnabledExtensionImes,
404 prefs, callback); 338 prefs, callback);
405 current_input_method_.Init(prefs::kLanguageCurrentInputMethod, 339 current_input_method_.Init(prefs::kLanguageCurrentInputMethod,
406 prefs, callback); 340 prefs, callback);
407 previous_input_method_.Init(prefs::kLanguagePreviousInputMethod, 341 previous_input_method_.Init(prefs::kLanguagePreviousInputMethod,
408 prefs, callback); 342 prefs, callback);
409 343
410 for (size_t i = 0; i < language_prefs::kNumChewingBooleanPrefs; ++i) {
411 chewing_boolean_prefs_[i].Init(
412 language_prefs::kChewingBooleanPrefs[i].pref_name, prefs, callback);
413 }
414 for (size_t i = 0; i < language_prefs::kNumChewingMultipleChoicePrefs; ++i) {
415 chewing_multiple_choice_prefs_[i].Init(
416 language_prefs::kChewingMultipleChoicePrefs[i].pref_name,
417 prefs, callback);
418 }
419 chewing_hsu_sel_key_type_.Init(
420 language_prefs::kChewingHsuSelKeyType.pref_name, prefs, callback);
421 for (size_t i = 0; i < language_prefs::kNumChewingIntegerPrefs; ++i) {
422 chewing_integer_prefs_[i].Init(
423 language_prefs::kChewingIntegerPrefs[i].pref_name, prefs, callback);
424 }
425 hangul_keyboard_.Init(prefs::kLanguageHangulKeyboard, prefs, callback);
426 hangul_hanja_binding_keys_.Init(
427 prefs::kLanguageHangulHanjaBindingKeys, prefs, callback);
428 for (size_t i = 0; i < language_prefs::kNumPinyinBooleanPrefs; ++i) {
429 pinyin_boolean_prefs_[i].Init(
430 language_prefs::kPinyinBooleanPrefs[i].pref_name, prefs, callback);
431 }
432 for (size_t i = 0; i < language_prefs::kNumPinyinIntegerPrefs; ++i) {
433 pinyin_int_prefs_[i].Init(
434 language_prefs::kPinyinIntegerPrefs[i].pref_name, prefs, callback);
435 }
436 pinyin_double_pinyin_schema_.Init(
437 language_prefs::kPinyinDoublePinyinSchema.pref_name, prefs, callback);
438 for (size_t i = 0; i < language_prefs::kNumMozcBooleanPrefs; ++i) {
439 mozc_boolean_prefs_[i].Init(
440 language_prefs::kMozcBooleanPrefs[i].pref_name, prefs, callback);
441 }
442 for (size_t i = 0; i < language_prefs::kNumMozcMultipleChoicePrefs; ++i) {
443 mozc_multiple_choice_prefs_[i].Init(
444 language_prefs::kMozcMultipleChoicePrefs[i].pref_name, prefs, callback);
445 }
446 for (size_t i = 0; i < language_prefs::kNumMozcIntegerPrefs; ++i) {
447 mozc_integer_prefs_[i].Init(
448 language_prefs::kMozcIntegerPrefs[i].pref_name, prefs, callback);
449 }
450 xkb_auto_repeat_enabled_.Init( 344 xkb_auto_repeat_enabled_.Init(
451 prefs::kLanguageXkbAutoRepeatEnabled, prefs, callback); 345 prefs::kLanguageXkbAutoRepeatEnabled, prefs, callback);
452 xkb_auto_repeat_delay_pref_.Init( 346 xkb_auto_repeat_delay_pref_.Init(
453 prefs::kLanguageXkbAutoRepeatDelay, prefs, callback); 347 prefs::kLanguageXkbAutoRepeatDelay, prefs, callback);
454 xkb_auto_repeat_interval_pref_.Init( 348 xkb_auto_repeat_interval_pref_.Init(
455 prefs::kLanguageXkbAutoRepeatInterval, prefs, callback); 349 prefs::kLanguageXkbAutoRepeatInterval, prefs, callback);
456 350
457 // TODO(achuith): Remove deprecated pref in M31. crbug.com/223480. 351 // TODO(achuith): Remove deprecated pref in M31. crbug.com/223480.
458 prefs->ClearPref(kEnableTouchpadThreeFingerSwipe); 352 prefs->ClearPref(kEnableTouchpadThreeFingerSwipe);
459 } 353 }
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
745 } 639 }
746 640
747 void Preferences::OnTouchHudProjectionToggled(bool enabled) { 641 void Preferences::OnTouchHudProjectionToggled(bool enabled) {
748 if (touch_hud_projection_enabled_.GetValue() == enabled) 642 if (touch_hud_projection_enabled_.GetValue() == enabled)
749 return; 643 return;
750 644
751 touch_hud_projection_enabled_.SetValue(enabled); 645 touch_hud_projection_enabled_.SetValue(enabled);
752 } 646 }
753 647
754 } // namespace chromeos 648 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/preferences.h ('k') | chrome/browser/resources/options/chromeos/language_chewing_options.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698