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 #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_delegate.h" | 8 #include "ash/shell_delegate.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 748 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
759 if (!pref_name || | 759 if (!pref_name || |
760 *pref_name == language_prefs::kChewingIntegerPrefs[i].pref_name) { | 760 *pref_name == language_prefs::kChewingIntegerPrefs[i].pref_name) { |
761 SetLanguageConfigInteger( | 761 SetLanguageConfigInteger( |
762 language_prefs::kChewingSectionName, | 762 language_prefs::kChewingSectionName, |
763 language_prefs::kChewingIntegerPrefs[i].ibus_config_name, | 763 language_prefs::kChewingIntegerPrefs[i].ibus_config_name, |
764 chewing_integer_prefs_[i].GetValue()); | 764 chewing_integer_prefs_[i].GetValue()); |
765 } | 765 } |
766 } | 766 } |
767 if (!pref_name || | 767 if (!pref_name || |
768 *pref_name == prefs::kLanguageHangulKeyboard) { | 768 *pref_name == prefs::kLanguageHangulKeyboard) { |
769 SetLanguageConfigString(language_prefs::kHangulSectionName, | 769 std::vector<std::string> new_input_method_ids; |
770 language_prefs::kHangulKeyboardConfigName, | 770 if (input_method_manager_->MigrateKoreanKeyboard( |
771 hangul_keyboard_.GetValue()); | 771 hangul_keyboard_.GetValue(), |
772 &new_input_method_ids)) { | |
773 preload_engines_.SetValue(JoinString(new_input_method_ids, ',')); | |
774 hangul_keyboard_.SetValue("dummy_value_already_migrated"); | |
775 } | |
772 } | 776 } |
773 if (!pref_name || *pref_name == prefs::kLanguageHangulHanjaBindingKeys) { | 777 if (!pref_name || *pref_name == prefs::kLanguageHangulHanjaBindingKeys) { |
Shu Chen
2013/06/28 03:06:54
this is no change?
Seigo Nonaka
2013/06/28 03:28:51
Yes, above change is for migration.
All configurat
satorux1
2013/07/01 03:33:45
Please file a bug and add the bug URL here.
Seigo Nonaka
2013/07/01 04:00:03
Done.
| |
774 SetLanguageConfigString(language_prefs::kHangulSectionName, | 778 SetLanguageConfigString(language_prefs::kHangulSectionName, |
775 language_prefs::kHangulHanjaBindingKeysConfigName, | 779 language_prefs::kHangulHanjaBindingKeysConfigName, |
776 hangul_hanja_binding_keys_.GetValue()); | 780 hangul_hanja_binding_keys_.GetValue()); |
777 } | 781 } |
778 for (size_t i = 0; i < language_prefs::kNumPinyinBooleanPrefs; ++i) { | 782 for (size_t i = 0; i < language_prefs::kNumPinyinBooleanPrefs; ++i) { |
779 if (!pref_name || | 783 if (!pref_name || |
780 *pref_name == language_prefs::kPinyinBooleanPrefs[i].pref_name) { | 784 *pref_name == language_prefs::kPinyinBooleanPrefs[i].pref_name) { |
781 SetLanguageConfigBoolean( | 785 SetLanguageConfigBoolean( |
782 language_prefs::kPinyinSectionName, | 786 language_prefs::kPinyinSectionName, |
783 language_prefs::kPinyinBooleanPrefs[i].ibus_config_name, | 787 language_prefs::kPinyinBooleanPrefs[i].ibus_config_name, |
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1004 | 1008 |
1005 input_method::AutoRepeatRate rate; | 1009 input_method::AutoRepeatRate rate; |
1006 rate.initial_delay_in_ms = xkb_auto_repeat_delay_pref_.GetValue(); | 1010 rate.initial_delay_in_ms = xkb_auto_repeat_delay_pref_.GetValue(); |
1007 rate.repeat_interval_in_ms = xkb_auto_repeat_interval_pref_.GetValue(); | 1011 rate.repeat_interval_in_ms = xkb_auto_repeat_interval_pref_.GetValue(); |
1008 DCHECK(rate.initial_delay_in_ms > 0); | 1012 DCHECK(rate.initial_delay_in_ms > 0); |
1009 DCHECK(rate.repeat_interval_in_ms > 0); | 1013 DCHECK(rate.repeat_interval_in_ms > 0); |
1010 input_method::XKeyboard::SetAutoRepeatRate(rate); | 1014 input_method::XKeyboard::SetAutoRepeatRate(rate); |
1011 } | 1015 } |
1012 | 1016 |
1013 } // namespace chromeos | 1017 } // namespace chromeos |
OLD | NEW |