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

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

Issue 7461114: Make hanja key customizable. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fixed some comment Created 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/chromeos/preferences.h ('k') | chrome/common/pref_names.h » ('j') | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/i18n/time_formatting.h" 7 #include "base/i18n/time_formatting.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/string_split.h" 9 #include "base/string_split.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 PrefService::UNSYNCABLE_PREF); 107 PrefService::UNSYNCABLE_PREF);
108 } 108 }
109 prefs->RegisterStringPref( 109 prefs->RegisterStringPref(
110 prefs::kLanguageHangulKeyboard, 110 prefs::kLanguageHangulKeyboard,
111 language_prefs::kHangulKeyboardNameIDPairs[0].keyboard_id, 111 language_prefs::kHangulKeyboardNameIDPairs[0].keyboard_id,
112 PrefService::SYNCABLE_PREF); 112 PrefService::SYNCABLE_PREF);
113 prefs->RegisterStringPref(prefs::kLanguageHangulHanjaKeys, 113 prefs->RegisterStringPref(prefs::kLanguageHangulHanjaKeys,
114 language_prefs::kHangulHanjaKeys, 114 language_prefs::kHangulHanjaKeys,
115 // Don't sync the pref as it's not user-configurable 115 // Don't sync the pref as it's not user-configurable
116 PrefService::UNSYNCABLE_PREF); 116 PrefService::UNSYNCABLE_PREF);
117 prefs->RegisterStringPref(prefs::kLanguageHangulHanjaBindingKeys,
118 language_prefs::kHangulHanjaBindingKeys,
119 // Don't sync the pref as it's not user-configurable
120 PrefService::UNSYNCABLE_PREF);
117 for (size_t i = 0; i < language_prefs::kNumPinyinBooleanPrefs; ++i) { 121 for (size_t i = 0; i < language_prefs::kNumPinyinBooleanPrefs; ++i) {
118 prefs->RegisterBooleanPref( 122 prefs->RegisterBooleanPref(
119 language_prefs::kPinyinBooleanPrefs[i].pref_name, 123 language_prefs::kPinyinBooleanPrefs[i].pref_name,
120 language_prefs::kPinyinBooleanPrefs[i].default_pref_value, 124 language_prefs::kPinyinBooleanPrefs[i].default_pref_value,
121 language_prefs::kPinyinBooleanPrefs[i].sync_status); 125 language_prefs::kPinyinBooleanPrefs[i].sync_status);
122 } 126 }
123 for (size_t i = 0; i < language_prefs::kNumPinyinIntegerPrefs; ++i) { 127 for (size_t i = 0; i < language_prefs::kNumPinyinIntegerPrefs; ++i) {
124 prefs->RegisterIntegerPref( 128 prefs->RegisterIntegerPref(
125 language_prefs::kPinyinIntegerPrefs[i].pref_name, 129 language_prefs::kPinyinIntegerPrefs[i].pref_name,
126 language_prefs::kPinyinIntegerPrefs[i].default_pref_value, 130 language_prefs::kPinyinIntegerPrefs[i].default_pref_value,
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 } 221 }
218 language_chewing_hsu_sel_key_type_.Init( 222 language_chewing_hsu_sel_key_type_.Init(
219 language_prefs::kChewingHsuSelKeyType.pref_name, prefs, this); 223 language_prefs::kChewingHsuSelKeyType.pref_name, prefs, this);
220 for (size_t i = 0; i < language_prefs::kNumChewingIntegerPrefs; ++i) { 224 for (size_t i = 0; i < language_prefs::kNumChewingIntegerPrefs; ++i) {
221 language_chewing_integer_prefs_[i].Init( 225 language_chewing_integer_prefs_[i].Init(
222 language_prefs::kChewingIntegerPrefs[i].pref_name, prefs, this); 226 language_prefs::kChewingIntegerPrefs[i].pref_name, prefs, this);
223 } 227 }
224 language_hangul_keyboard_.Init(prefs::kLanguageHangulKeyboard, prefs, this); 228 language_hangul_keyboard_.Init(prefs::kLanguageHangulKeyboard, prefs, this);
225 language_hangul_hanja_keys_.Init( 229 language_hangul_hanja_keys_.Init(
226 prefs::kLanguageHangulHanjaKeys, prefs, this); 230 prefs::kLanguageHangulHanjaKeys, prefs, this);
231 language_hangul_hanja_binding_keys_.Init(
232 prefs::kLanguageHangulHanjaBindingKeys, prefs, this);
227 for (size_t i = 0; i < language_prefs::kNumPinyinBooleanPrefs; ++i) { 233 for (size_t i = 0; i < language_prefs::kNumPinyinBooleanPrefs; ++i) {
228 language_pinyin_boolean_prefs_[i].Init( 234 language_pinyin_boolean_prefs_[i].Init(
229 language_prefs::kPinyinBooleanPrefs[i].pref_name, prefs, this); 235 language_prefs::kPinyinBooleanPrefs[i].pref_name, prefs, this);
230 } 236 }
231 for (size_t i = 0; i < language_prefs::kNumPinyinIntegerPrefs; ++i) { 237 for (size_t i = 0; i < language_prefs::kNumPinyinIntegerPrefs; ++i) {
232 language_pinyin_int_prefs_[i].Init( 238 language_pinyin_int_prefs_[i].Init(
233 language_prefs::kPinyinIntegerPrefs[i].pref_name, prefs, this); 239 language_prefs::kPinyinIntegerPrefs[i].pref_name, prefs, this);
234 } 240 }
235 language_pinyin_double_pinyin_schema_.Init( 241 language_pinyin_double_pinyin_schema_.Init(
236 language_prefs::kPinyinDoublePinyinSchema.pref_name, prefs, this); 242 language_prefs::kPinyinDoublePinyinSchema.pref_name, prefs, this);
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 *pref_name == prefs::kLanguageHangulKeyboard) { 390 *pref_name == prefs::kLanguageHangulKeyboard) {
385 SetLanguageConfigString(language_prefs::kHangulSectionName, 391 SetLanguageConfigString(language_prefs::kHangulSectionName,
386 language_prefs::kHangulKeyboardConfigName, 392 language_prefs::kHangulKeyboardConfigName,
387 language_hangul_keyboard_.GetValue()); 393 language_hangul_keyboard_.GetValue());
388 } 394 }
389 if (!pref_name || *pref_name == prefs::kLanguageHangulHanjaKeys) { 395 if (!pref_name || *pref_name == prefs::kLanguageHangulHanjaKeys) {
390 SetLanguageConfigString(language_prefs::kHangulSectionName, 396 SetLanguageConfigString(language_prefs::kHangulSectionName,
391 language_prefs::kHangulHanjaKeysConfigName, 397 language_prefs::kHangulHanjaKeysConfigName,
392 language_hangul_hanja_keys_.GetValue()); 398 language_hangul_hanja_keys_.GetValue());
393 } 399 }
400 if (!pref_name || *pref_name == prefs::kLanguageHangulHanjaBindingKeys) {
401 SetLanguageConfigString(language_prefs::kHangulSectionName,
402 language_prefs::kHangulHanjaBindingKeysConfigName,
403 language_hangul_hanja_binding_keys_.GetValue());
404 }
394 for (size_t i = 0; i < language_prefs::kNumPinyinBooleanPrefs; ++i) { 405 for (size_t i = 0; i < language_prefs::kNumPinyinBooleanPrefs; ++i) {
395 if (!pref_name || 406 if (!pref_name ||
396 *pref_name == language_prefs::kPinyinBooleanPrefs[i].pref_name) { 407 *pref_name == language_prefs::kPinyinBooleanPrefs[i].pref_name) {
397 SetLanguageConfigBoolean( 408 SetLanguageConfigBoolean(
398 language_prefs::kPinyinSectionName, 409 language_prefs::kPinyinSectionName,
399 language_prefs::kPinyinBooleanPrefs[i].ibus_config_name, 410 language_prefs::kPinyinBooleanPrefs[i].ibus_config_name,
400 language_pinyin_boolean_prefs_[i].GetValue()); 411 language_pinyin_boolean_prefs_[i].GetValue());
401 } 412 }
402 } 413 }
403 for (size_t i = 0; i < language_prefs::kNumPinyinIntegerPrefs; ++i) { 414 for (size_t i = 0; i < language_prefs::kNumPinyinIntegerPrefs; ++i) {
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 input_method::AutoRepeatRate rate; 556 input_method::AutoRepeatRate rate;
546 rate.initial_delay_in_ms = language_xkb_auto_repeat_delay_pref_.GetValue(); 557 rate.initial_delay_in_ms = language_xkb_auto_repeat_delay_pref_.GetValue();
547 rate.repeat_interval_in_ms = 558 rate.repeat_interval_in_ms =
548 language_xkb_auto_repeat_interval_pref_.GetValue(); 559 language_xkb_auto_repeat_interval_pref_.GetValue();
549 DCHECK(rate.initial_delay_in_ms > 0); 560 DCHECK(rate.initial_delay_in_ms > 0);
550 DCHECK(rate.repeat_interval_in_ms > 0); 561 DCHECK(rate.repeat_interval_in_ms > 0);
551 input_method::SetAutoRepeatRate(rate); 562 input_method::SetAutoRepeatRate(rate);
552 } 563 }
553 564
554 } // namespace chromeos 565 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/preferences.h ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698