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

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

Issue 7608019: Remove ibus-hangul support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review fix 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
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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 for (size_t i = 0; i < language_prefs::kNumChewingIntegerPrefs; ++i) { 103 for (size_t i = 0; i < language_prefs::kNumChewingIntegerPrefs; ++i) {
104 prefs->RegisterIntegerPref( 104 prefs->RegisterIntegerPref(
105 language_prefs::kChewingIntegerPrefs[i].pref_name, 105 language_prefs::kChewingIntegerPrefs[i].pref_name,
106 language_prefs::kChewingIntegerPrefs[i].default_pref_value, 106 language_prefs::kChewingIntegerPrefs[i].default_pref_value,
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,
114 language_prefs::kHangulHanjaKeys,
115 // Don't sync the pref as it's not user-configurable
116 PrefService::UNSYNCABLE_PREF);
117 prefs->RegisterStringPref(prefs::kLanguageHangulHanjaBindingKeys, 113 prefs->RegisterStringPref(prefs::kLanguageHangulHanjaBindingKeys,
118 language_prefs::kHangulHanjaBindingKeys, 114 language_prefs::kHangulHanjaBindingKeys,
119 // Don't sync the pref as it's not user-configurable 115 // Don't sync the pref as it's not user-configurable
120 PrefService::UNSYNCABLE_PREF); 116 PrefService::UNSYNCABLE_PREF);
121 for (size_t i = 0; i < language_prefs::kNumPinyinBooleanPrefs; ++i) { 117 for (size_t i = 0; i < language_prefs::kNumPinyinBooleanPrefs; ++i) {
122 prefs->RegisterBooleanPref( 118 prefs->RegisterBooleanPref(
123 language_prefs::kPinyinBooleanPrefs[i].pref_name, 119 language_prefs::kPinyinBooleanPrefs[i].pref_name,
124 language_prefs::kPinyinBooleanPrefs[i].default_pref_value, 120 language_prefs::kPinyinBooleanPrefs[i].default_pref_value,
125 language_prefs::kPinyinBooleanPrefs[i].sync_status); 121 language_prefs::kPinyinBooleanPrefs[i].sync_status);
126 } 122 }
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 language_chewing_multiple_choice_prefs_[i].Init( 226 language_chewing_multiple_choice_prefs_[i].Init(
231 language_prefs::kChewingMultipleChoicePrefs[i].pref_name, prefs, this); 227 language_prefs::kChewingMultipleChoicePrefs[i].pref_name, prefs, this);
232 } 228 }
233 language_chewing_hsu_sel_key_type_.Init( 229 language_chewing_hsu_sel_key_type_.Init(
234 language_prefs::kChewingHsuSelKeyType.pref_name, prefs, this); 230 language_prefs::kChewingHsuSelKeyType.pref_name, prefs, this);
235 for (size_t i = 0; i < language_prefs::kNumChewingIntegerPrefs; ++i) { 231 for (size_t i = 0; i < language_prefs::kNumChewingIntegerPrefs; ++i) {
236 language_chewing_integer_prefs_[i].Init( 232 language_chewing_integer_prefs_[i].Init(
237 language_prefs::kChewingIntegerPrefs[i].pref_name, prefs, this); 233 language_prefs::kChewingIntegerPrefs[i].pref_name, prefs, this);
238 } 234 }
239 language_hangul_keyboard_.Init(prefs::kLanguageHangulKeyboard, prefs, this); 235 language_hangul_keyboard_.Init(prefs::kLanguageHangulKeyboard, prefs, this);
240 language_hangul_hanja_keys_.Init(
241 prefs::kLanguageHangulHanjaKeys, prefs, this);
242 language_hangul_hanja_binding_keys_.Init( 236 language_hangul_hanja_binding_keys_.Init(
243 prefs::kLanguageHangulHanjaBindingKeys, prefs, this); 237 prefs::kLanguageHangulHanjaBindingKeys, prefs, this);
244 for (size_t i = 0; i < language_prefs::kNumPinyinBooleanPrefs; ++i) { 238 for (size_t i = 0; i < language_prefs::kNumPinyinBooleanPrefs; ++i) {
245 language_pinyin_boolean_prefs_[i].Init( 239 language_pinyin_boolean_prefs_[i].Init(
246 language_prefs::kPinyinBooleanPrefs[i].pref_name, prefs, this); 240 language_prefs::kPinyinBooleanPrefs[i].pref_name, prefs, this);
247 } 241 }
248 for (size_t i = 0; i < language_prefs::kNumPinyinIntegerPrefs; ++i) { 242 for (size_t i = 0; i < language_prefs::kNumPinyinIntegerPrefs; ++i) {
249 language_pinyin_int_prefs_[i].Init( 243 language_pinyin_int_prefs_[i].Init(
250 language_prefs::kPinyinIntegerPrefs[i].pref_name, prefs, this); 244 language_prefs::kPinyinIntegerPrefs[i].pref_name, prefs, this);
251 } 245 }
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 language_prefs::kChewingIntegerPrefs[i].ibus_config_name, 393 language_prefs::kChewingIntegerPrefs[i].ibus_config_name,
400 language_chewing_integer_prefs_[i].GetValue()); 394 language_chewing_integer_prefs_[i].GetValue());
401 } 395 }
402 } 396 }
403 if (!pref_name || 397 if (!pref_name ||
404 *pref_name == prefs::kLanguageHangulKeyboard) { 398 *pref_name == prefs::kLanguageHangulKeyboard) {
405 SetLanguageConfigString(language_prefs::kHangulSectionName, 399 SetLanguageConfigString(language_prefs::kHangulSectionName,
406 language_prefs::kHangulKeyboardConfigName, 400 language_prefs::kHangulKeyboardConfigName,
407 language_hangul_keyboard_.GetValue()); 401 language_hangul_keyboard_.GetValue());
408 } 402 }
409 if (!pref_name || *pref_name == prefs::kLanguageHangulHanjaKeys) {
410 SetLanguageConfigString(language_prefs::kHangulSectionName,
411 language_prefs::kHangulHanjaKeysConfigName,
412 language_hangul_hanja_keys_.GetValue());
413 }
414 if (!pref_name || *pref_name == prefs::kLanguageHangulHanjaBindingKeys) { 403 if (!pref_name || *pref_name == prefs::kLanguageHangulHanjaBindingKeys) {
415 SetLanguageConfigString(language_prefs::kHangulSectionName, 404 SetLanguageConfigString(language_prefs::kHangulSectionName,
416 language_prefs::kHangulHanjaBindingKeysConfigName, 405 language_prefs::kHangulHanjaBindingKeysConfigName,
417 language_hangul_hanja_binding_keys_.GetValue()); 406 language_hangul_hanja_binding_keys_.GetValue());
418 } 407 }
419 for (size_t i = 0; i < language_prefs::kNumPinyinBooleanPrefs; ++i) { 408 for (size_t i = 0; i < language_prefs::kNumPinyinBooleanPrefs; ++i) {
420 if (!pref_name || 409 if (!pref_name ||
421 *pref_name == language_prefs::kPinyinBooleanPrefs[i].pref_name) { 410 *pref_name == language_prefs::kPinyinBooleanPrefs[i].pref_name) {
422 SetLanguageConfigBoolean( 411 SetLanguageConfigBoolean(
423 language_prefs::kPinyinSectionName, 412 language_prefs::kPinyinSectionName,
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
590 iter != virtual_keyboard_pref->end_keys(); 579 iter != virtual_keyboard_pref->end_keys();
591 ++iter) { 580 ++iter) {
592 const std::string& xkb_layout = *iter; 581 const std::string& xkb_layout = *iter;
593 if (!virtual_keyboard_pref->GetString(xkb_layout, &url)) 582 if (!virtual_keyboard_pref->GetString(xkb_layout, &url))
594 continue; 583 continue;
595 input_method_manager->SetVirtualKeyboardPreference(xkb_layout, GURL(url)); 584 input_method_manager->SetVirtualKeyboardPreference(xkb_layout, GURL(url));
596 } 585 }
597 } 586 }
598 587
599 } // namespace chromeos 588 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/language_preferences.cc ('k') | chrome/browser/chromeos/status/input_method_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698