OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/string_util.h" | 7 #include "base/string_util.h" |
8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
10 #include "chrome/browser/chromeos/cros/cros_library.h" | 10 #include "chrome/browser/chromeos/cros/cros_library.h" |
(...skipping 16 matching lines...) Expand all Loading... |
27 prefs->RegisterBooleanPref(prefs::kTapToClickEnabled, false); | 27 prefs->RegisterBooleanPref(prefs::kTapToClickEnabled, false); |
28 prefs->RegisterBooleanPref(prefs::kLabsMediaplayerEnabled, false); | 28 prefs->RegisterBooleanPref(prefs::kLabsMediaplayerEnabled, false); |
29 prefs->RegisterBooleanPref(prefs::kLabsAdvancedFilesystemEnabled, false); | 29 prefs->RegisterBooleanPref(prefs::kLabsAdvancedFilesystemEnabled, false); |
30 prefs->RegisterBooleanPref(prefs::kAccessibilityEnabled, false); | 30 prefs->RegisterBooleanPref(prefs::kAccessibilityEnabled, false); |
31 prefs->RegisterBooleanPref(prefs::kVertEdgeScrollEnabled, false); | 31 prefs->RegisterBooleanPref(prefs::kVertEdgeScrollEnabled, false); |
32 prefs->RegisterIntegerPref(prefs::kTouchpadSpeedFactor, 9); | 32 prefs->RegisterIntegerPref(prefs::kTouchpadSpeedFactor, 9); |
33 prefs->RegisterIntegerPref(prefs::kTouchpadSensitivity, 5); | 33 prefs->RegisterIntegerPref(prefs::kTouchpadSensitivity, 5); |
34 prefs->RegisterStringPref(prefs::kLanguageCurrentInputMethod, ""); | 34 prefs->RegisterStringPref(prefs::kLanguageCurrentInputMethod, ""); |
35 prefs->RegisterStringPref(prefs::kLanguagePreviousInputMethod, ""); | 35 prefs->RegisterStringPref(prefs::kLanguagePreviousInputMethod, ""); |
36 prefs->RegisterStringPref(prefs::kLanguageHotkeyNextEngineInMenu, | 36 prefs->RegisterStringPref(prefs::kLanguageHotkeyNextEngineInMenu, |
37 kHotkeyNextEngineInMenu); | 37 language_prefs::kHotkeyNextEngineInMenu); |
38 prefs->RegisterStringPref(prefs::kLanguageHotkeyPreviousEngine, | 38 prefs->RegisterStringPref(prefs::kLanguageHotkeyPreviousEngine, |
39 kHotkeyPreviousEngine); | 39 language_prefs::kHotkeyPreviousEngine); |
40 prefs->RegisterStringPref(prefs::kLanguagePreferredLanguages, ""); | 40 prefs->RegisterStringPref(prefs::kLanguagePreferredLanguages, ""); |
41 prefs->RegisterStringPref(prefs::kLanguagePreloadEngines, | 41 prefs->RegisterStringPref(prefs::kLanguagePreloadEngines, |
42 kFallbackInputMethodId); // EN layout | 42 kFallbackInputMethodId); // EN layout |
43 for (size_t i = 0; i < kNumChewingBooleanPrefs; ++i) { | 43 for (size_t i = 0; i < language_prefs::kNumChewingBooleanPrefs; ++i) { |
44 prefs->RegisterBooleanPref(kChewingBooleanPrefs[i].pref_name, | 44 prefs->RegisterBooleanPref( |
45 kChewingBooleanPrefs[i].default_pref_value); | 45 language_prefs::kChewingBooleanPrefs[i].pref_name, |
| 46 language_prefs::kChewingBooleanPrefs[i].default_pref_value); |
46 } | 47 } |
47 for (size_t i = 0; i < kNumChewingMultipleChoicePrefs; ++i) { | 48 for (size_t i = 0; i < language_prefs::kNumChewingMultipleChoicePrefs; ++i) { |
48 prefs->RegisterStringPref( | 49 prefs->RegisterStringPref( |
49 kChewingMultipleChoicePrefs[i].pref_name, | 50 language_prefs::kChewingMultipleChoicePrefs[i].pref_name, |
50 kChewingMultipleChoicePrefs[i].default_pref_value); | 51 language_prefs::kChewingMultipleChoicePrefs[i].default_pref_value); |
51 } | 52 } |
52 prefs->RegisterIntegerPref(kChewingHsuSelKeyType.pref_name, | 53 prefs->RegisterIntegerPref( |
53 kChewingHsuSelKeyType.default_pref_value); | 54 language_prefs::kChewingHsuSelKeyType.pref_name, |
| 55 language_prefs::kChewingHsuSelKeyType.default_pref_value); |
54 | 56 |
55 for (size_t i = 0; i < kNumChewingIntegerPrefs; ++i) { | 57 for (size_t i = 0; i < language_prefs::kNumChewingIntegerPrefs; ++i) { |
56 prefs->RegisterIntegerPref(kChewingIntegerPrefs[i].pref_name, | 58 prefs->RegisterIntegerPref( |
57 kChewingIntegerPrefs[i].default_pref_value); | 59 language_prefs::kChewingIntegerPrefs[i].pref_name, |
| 60 language_prefs::kChewingIntegerPrefs[i].default_pref_value); |
58 } | 61 } |
59 prefs->RegisterStringPref( | 62 prefs->RegisterStringPref( |
60 prefs::kLanguageHangulKeyboard, | 63 prefs::kLanguageHangulKeyboard, |
61 kHangulKeyboardNameIDPairs[0].keyboard_id); | 64 language_prefs::kHangulKeyboardNameIDPairs[0].keyboard_id); |
62 prefs->RegisterStringPref(prefs::kLanguageHangulHanjaKeys, kHangulHanjaKeys); | 65 prefs->RegisterStringPref(prefs::kLanguageHangulHanjaKeys, |
63 for (size_t i = 0; i < kNumPinyinBooleanPrefs; ++i) { | 66 language_prefs::kHangulHanjaKeys); |
64 prefs->RegisterBooleanPref(kPinyinBooleanPrefs[i].pref_name, | 67 for (size_t i = 0; i < language_prefs::kNumPinyinBooleanPrefs; ++i) { |
65 kPinyinBooleanPrefs[i].default_pref_value); | 68 prefs->RegisterBooleanPref( |
| 69 language_prefs::kPinyinBooleanPrefs[i].pref_name, |
| 70 language_prefs::kPinyinBooleanPrefs[i].default_pref_value); |
66 } | 71 } |
67 for (size_t i = 0; i < kNumPinyinIntegerPrefs; ++i) { | 72 for (size_t i = 0; i < language_prefs::kNumPinyinIntegerPrefs; ++i) { |
68 prefs->RegisterIntegerPref(kPinyinIntegerPrefs[i].pref_name, | 73 prefs->RegisterIntegerPref( |
69 kPinyinIntegerPrefs[i].default_pref_value); | 74 language_prefs::kPinyinIntegerPrefs[i].pref_name, |
| 75 language_prefs::kPinyinIntegerPrefs[i].default_pref_value); |
70 } | 76 } |
71 prefs->RegisterIntegerPref(kPinyinDoublePinyinSchema.pref_name, | 77 prefs->RegisterIntegerPref( |
72 kPinyinDoublePinyinSchema.default_pref_value); | 78 language_prefs::kPinyinDoublePinyinSchema.pref_name, |
| 79 language_prefs::kPinyinDoublePinyinSchema.default_pref_value); |
73 | 80 |
74 for (size_t i = 0; i < kNumMozcBooleanPrefs; ++i) { | 81 for (size_t i = 0; i < language_prefs::kNumMozcBooleanPrefs; ++i) { |
75 prefs->RegisterBooleanPref(kMozcBooleanPrefs[i].pref_name, | 82 prefs->RegisterBooleanPref( |
76 kMozcBooleanPrefs[i].default_pref_value); | 83 language_prefs::kMozcBooleanPrefs[i].pref_name, |
| 84 language_prefs::kMozcBooleanPrefs[i].default_pref_value); |
77 } | 85 } |
78 for (size_t i = 0; i < kNumMozcMultipleChoicePrefs; ++i) { | 86 for (size_t i = 0; i < language_prefs::kNumMozcMultipleChoicePrefs; ++i) { |
79 prefs->RegisterStringPref( | 87 prefs->RegisterStringPref( |
80 kMozcMultipleChoicePrefs[i].pref_name, | 88 language_prefs::kMozcMultipleChoicePrefs[i].pref_name, |
81 kMozcMultipleChoicePrefs[i].default_pref_value); | 89 language_prefs::kMozcMultipleChoicePrefs[i].default_pref_value); |
82 } | 90 } |
83 for (size_t i = 0; i < kNumMozcIntegerPrefs; ++i) { | 91 for (size_t i = 0; i < language_prefs::kNumMozcIntegerPrefs; ++i) { |
84 prefs->RegisterIntegerPref(kMozcIntegerPrefs[i].pref_name, | 92 prefs->RegisterIntegerPref( |
85 kMozcIntegerPrefs[i].default_pref_value); | 93 language_prefs::kMozcIntegerPrefs[i].pref_name, |
| 94 language_prefs::kMozcIntegerPrefs[i].default_pref_value); |
86 } | 95 } |
87 prefs->RegisterIntegerPref(prefs::kLanguageXkbRemapSearchKeyTo, kSearchKey); | 96 prefs->RegisterIntegerPref(prefs::kLanguageXkbRemapSearchKeyTo, kSearchKey); |
88 prefs->RegisterIntegerPref(prefs::kLanguageXkbRemapControlKeyTo, | 97 prefs->RegisterIntegerPref(prefs::kLanguageXkbRemapControlKeyTo, |
89 kLeftControlKey); | 98 kLeftControlKey); |
90 prefs->RegisterIntegerPref(prefs::kLanguageXkbRemapAltKeyTo, kLeftAltKey); | 99 prefs->RegisterIntegerPref(prefs::kLanguageXkbRemapAltKeyTo, kLeftAltKey); |
91 prefs->RegisterBooleanPref(prefs::kLanguageXkbAutoRepeatEnabled, true); | 100 prefs->RegisterBooleanPref(prefs::kLanguageXkbAutoRepeatEnabled, true); |
92 prefs->RegisterIntegerPref(kXkbAutoRepeatDelayPref.pref_name, | 101 prefs->RegisterIntegerPref( |
93 kXkbAutoRepeatDelayPref.default_pref_value); | 102 language_prefs::kXkbAutoRepeatDelayPref.pref_name, |
94 prefs->RegisterIntegerPref(kXkbAutoRepeatIntervalPref.pref_name, | 103 language_prefs::kXkbAutoRepeatDelayPref.default_pref_value); |
95 kXkbAutoRepeatIntervalPref.default_pref_value); | 104 prefs->RegisterIntegerPref( |
| 105 language_prefs::kXkbAutoRepeatIntervalPref.pref_name, |
| 106 language_prefs::kXkbAutoRepeatIntervalPref.default_pref_value); |
96 } | 107 } |
97 | 108 |
98 void Preferences::Init(PrefService* prefs) { | 109 void Preferences::Init(PrefService* prefs) { |
99 tap_to_click_enabled_.Init(prefs::kTapToClickEnabled, prefs, this); | 110 tap_to_click_enabled_.Init(prefs::kTapToClickEnabled, prefs, this); |
100 accessibility_enabled_.Init(prefs::kAccessibilityEnabled, prefs, this); | 111 accessibility_enabled_.Init(prefs::kAccessibilityEnabled, prefs, this); |
101 vert_edge_scroll_enabled_.Init(prefs::kVertEdgeScrollEnabled, prefs, this); | 112 vert_edge_scroll_enabled_.Init(prefs::kVertEdgeScrollEnabled, prefs, this); |
102 speed_factor_.Init(prefs::kTouchpadSpeedFactor, prefs, this); | 113 speed_factor_.Init(prefs::kTouchpadSpeedFactor, prefs, this); |
103 sensitivity_.Init(prefs::kTouchpadSensitivity, prefs, this); | 114 sensitivity_.Init(prefs::kTouchpadSensitivity, prefs, this); |
104 language_hotkey_next_engine_in_menu_.Init( | 115 language_hotkey_next_engine_in_menu_.Init( |
105 prefs::kLanguageHotkeyNextEngineInMenu, prefs, this); | 116 prefs::kLanguageHotkeyNextEngineInMenu, prefs, this); |
106 language_hotkey_previous_engine_.Init( | 117 language_hotkey_previous_engine_.Init( |
107 prefs::kLanguageHotkeyPreviousEngine, prefs, this); | 118 prefs::kLanguageHotkeyPreviousEngine, prefs, this); |
108 language_preferred_languages_.Init(prefs::kLanguagePreferredLanguages, | 119 language_preferred_languages_.Init(prefs::kLanguagePreferredLanguages, |
109 prefs, this); | 120 prefs, this); |
110 language_preload_engines_.Init(prefs::kLanguagePreloadEngines, prefs, this); | 121 language_preload_engines_.Init(prefs::kLanguagePreloadEngines, prefs, this); |
111 for (size_t i = 0; i < kNumChewingBooleanPrefs; ++i) { | 122 for (size_t i = 0; i < language_prefs::kNumChewingBooleanPrefs; ++i) { |
112 language_chewing_boolean_prefs_[i].Init( | 123 language_chewing_boolean_prefs_[i].Init( |
113 kChewingBooleanPrefs[i].pref_name, prefs, this); | 124 language_prefs::kChewingBooleanPrefs[i].pref_name, prefs, this); |
114 } | 125 } |
115 for (size_t i = 0; i < kNumChewingMultipleChoicePrefs; ++i) { | 126 for (size_t i = 0; i < language_prefs::kNumChewingMultipleChoicePrefs; ++i) { |
116 language_chewing_multiple_choice_prefs_[i].Init( | 127 language_chewing_multiple_choice_prefs_[i].Init( |
117 kChewingMultipleChoicePrefs[i].pref_name, prefs, this); | 128 language_prefs::kChewingMultipleChoicePrefs[i].pref_name, prefs, this); |
118 } | 129 } |
119 language_chewing_hsu_sel_key_type_.Init( | 130 language_chewing_hsu_sel_key_type_.Init( |
120 kChewingHsuSelKeyType.pref_name, prefs, this); | 131 language_prefs::kChewingHsuSelKeyType.pref_name, prefs, this); |
121 for (size_t i = 0; i < kNumChewingIntegerPrefs; ++i) { | 132 for (size_t i = 0; i < language_prefs::kNumChewingIntegerPrefs; ++i) { |
122 language_chewing_integer_prefs_[i].Init( | 133 language_chewing_integer_prefs_[i].Init( |
123 kChewingIntegerPrefs[i].pref_name, prefs, this); | 134 language_prefs::kChewingIntegerPrefs[i].pref_name, prefs, this); |
124 } | 135 } |
125 language_hangul_keyboard_.Init(prefs::kLanguageHangulKeyboard, prefs, this); | 136 language_hangul_keyboard_.Init(prefs::kLanguageHangulKeyboard, prefs, this); |
126 language_hangul_hanja_keys_.Init( | 137 language_hangul_hanja_keys_.Init( |
127 prefs::kLanguageHangulHanjaKeys, prefs, this); | 138 prefs::kLanguageHangulHanjaKeys, prefs, this); |
128 for (size_t i = 0; i < kNumPinyinBooleanPrefs; ++i) { | 139 for (size_t i = 0; i < language_prefs::kNumPinyinBooleanPrefs; ++i) { |
129 language_pinyin_boolean_prefs_[i].Init( | 140 language_pinyin_boolean_prefs_[i].Init( |
130 kPinyinBooleanPrefs[i].pref_name, prefs, this); | 141 language_prefs::kPinyinBooleanPrefs[i].pref_name, prefs, this); |
131 } | 142 } |
132 for (size_t i = 0; i < kNumPinyinIntegerPrefs; ++i) { | 143 for (size_t i = 0; i < language_prefs::kNumPinyinIntegerPrefs; ++i) { |
133 language_pinyin_int_prefs_[i].Init( | 144 language_pinyin_int_prefs_[i].Init( |
134 kPinyinIntegerPrefs[i].pref_name, prefs, this); | 145 language_prefs::kPinyinIntegerPrefs[i].pref_name, prefs, this); |
135 } | 146 } |
136 language_pinyin_double_pinyin_schema_.Init( | 147 language_pinyin_double_pinyin_schema_.Init( |
137 kPinyinDoublePinyinSchema.pref_name, prefs, this); | 148 language_prefs::kPinyinDoublePinyinSchema.pref_name, prefs, this); |
138 for (size_t i = 0; i < kNumMozcBooleanPrefs; ++i) { | 149 for (size_t i = 0; i < language_prefs::kNumMozcBooleanPrefs; ++i) { |
139 language_mozc_boolean_prefs_[i].Init( | 150 language_mozc_boolean_prefs_[i].Init( |
140 kMozcBooleanPrefs[i].pref_name, prefs, this); | 151 language_prefs::kMozcBooleanPrefs[i].pref_name, prefs, this); |
141 } | 152 } |
142 for (size_t i = 0; i < kNumMozcMultipleChoicePrefs; ++i) { | 153 for (size_t i = 0; i < language_prefs::kNumMozcMultipleChoicePrefs; ++i) { |
143 language_mozc_multiple_choice_prefs_[i].Init( | 154 language_mozc_multiple_choice_prefs_[i].Init( |
144 kMozcMultipleChoicePrefs[i].pref_name, prefs, this); | 155 language_prefs::kMozcMultipleChoicePrefs[i].pref_name, prefs, this); |
145 } | 156 } |
146 for (size_t i = 0; i < kNumMozcIntegerPrefs; ++i) { | 157 for (size_t i = 0; i < language_prefs::kNumMozcIntegerPrefs; ++i) { |
147 language_mozc_integer_prefs_[i].Init( | 158 language_mozc_integer_prefs_[i].Init( |
148 kMozcIntegerPrefs[i].pref_name, prefs, this); | 159 language_prefs::kMozcIntegerPrefs[i].pref_name, prefs, this); |
149 } | 160 } |
150 language_xkb_remap_search_key_to_.Init( | 161 language_xkb_remap_search_key_to_.Init( |
151 prefs::kLanguageXkbRemapSearchKeyTo, prefs, this); | 162 prefs::kLanguageXkbRemapSearchKeyTo, prefs, this); |
152 language_xkb_remap_control_key_to_.Init( | 163 language_xkb_remap_control_key_to_.Init( |
153 prefs::kLanguageXkbRemapControlKeyTo, prefs, this); | 164 prefs::kLanguageXkbRemapControlKeyTo, prefs, this); |
154 language_xkb_remap_alt_key_to_.Init( | 165 language_xkb_remap_alt_key_to_.Init( |
155 prefs::kLanguageXkbRemapAltKeyTo, prefs, this); | 166 prefs::kLanguageXkbRemapAltKeyTo, prefs, this); |
156 language_xkb_auto_repeat_enabled_.Init( | 167 language_xkb_auto_repeat_enabled_.Init( |
157 prefs::kLanguageXkbAutoRepeatEnabled, prefs, this); | 168 prefs::kLanguageXkbAutoRepeatEnabled, prefs, this); |
158 language_xkb_auto_repeat_delay_pref_.Init( | 169 language_xkb_auto_repeat_delay_pref_.Init( |
159 kXkbAutoRepeatDelayPref.pref_name, prefs, this); | 170 language_prefs::kXkbAutoRepeatDelayPref.pref_name, prefs, this); |
160 language_xkb_auto_repeat_interval_pref_.Init( | 171 language_xkb_auto_repeat_interval_pref_.Init( |
161 kXkbAutoRepeatIntervalPref.pref_name, prefs, this); | 172 language_prefs::kXkbAutoRepeatIntervalPref.pref_name, prefs, this); |
162 | 173 |
163 std::string locale(g_browser_process->GetApplicationLocale()); | 174 std::string locale(g_browser_process->GetApplicationLocale()); |
164 // Add input methods based on the application locale when the user first | 175 // Add input methods based on the application locale when the user first |
165 // logs in. For instance, if the user chooses Japanese as the UI | 176 // logs in. For instance, if the user chooses Japanese as the UI |
166 // language at the first login, we'll add input methods associated with | 177 // language at the first login, we'll add input methods associated with |
167 // Japanese, such as mozc. | 178 // Japanese, such as mozc. |
168 if (locale != kFallbackInputMethodLocale && | 179 if (locale != kFallbackInputMethodLocale && |
169 !prefs->HasPrefPath(prefs::kLanguagePreloadEngines)) { | 180 !prefs->HasPrefPath(prefs::kLanguagePreloadEngines)) { |
170 std::string preload_engines(language_preload_engines_.GetValue()); | 181 std::string preload_engines(language_preload_engines_.GetValue()); |
171 std::vector<std::string> input_method_ids; | 182 std::vector<std::string> input_method_ids; |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
219 CrosLibrary::Get()->GetSynapticsLibrary()->SetRangeParameter( | 230 CrosLibrary::Get()->GetSynapticsLibrary()->SetRangeParameter( |
220 PARAM_RANGE_TOUCH_SENSITIVITY, | 231 PARAM_RANGE_TOUCH_SENSITIVITY, |
221 sensitivity_.GetValue()); | 232 sensitivity_.GetValue()); |
222 } | 233 } |
223 | 234 |
224 // We don't handle prefs::kLanguageCurrentInputMethod and PreviousInputMethod | 235 // We don't handle prefs::kLanguageCurrentInputMethod and PreviousInputMethod |
225 // here. | 236 // here. |
226 | 237 |
227 if (!pref_name || *pref_name == prefs::kLanguageHotkeyNextEngineInMenu) { | 238 if (!pref_name || *pref_name == prefs::kLanguageHotkeyNextEngineInMenu) { |
228 SetLanguageConfigStringListAsCSV( | 239 SetLanguageConfigStringListAsCSV( |
229 kHotKeySectionName, | 240 language_prefs::kHotKeySectionName, |
230 kNextEngineInMenuConfigName, | 241 language_prefs::kNextEngineInMenuConfigName, |
231 language_hotkey_next_engine_in_menu_.GetValue()); | 242 language_hotkey_next_engine_in_menu_.GetValue()); |
232 } | 243 } |
233 if (!pref_name || *pref_name == prefs::kLanguageHotkeyPreviousEngine) { | 244 if (!pref_name || *pref_name == prefs::kLanguageHotkeyPreviousEngine) { |
234 SetLanguageConfigStringListAsCSV( | 245 SetLanguageConfigStringListAsCSV( |
235 kHotKeySectionName, | 246 language_prefs::kHotKeySectionName, |
236 kPreviousEngineConfigName, | 247 language_prefs::kPreviousEngineConfigName, |
237 language_hotkey_previous_engine_.GetValue()); | 248 language_hotkey_previous_engine_.GetValue()); |
238 } | 249 } |
239 if (!pref_name || *pref_name == prefs::kLanguagePreferredLanguages) { | 250 if (!pref_name || *pref_name == prefs::kLanguagePreferredLanguages) { |
240 // Unlike kLanguagePreloadEngines and some other input method | 251 // Unlike kLanguagePreloadEngines and some other input method |
241 // preferencs, we don't need to send this to ibus-daemon. | 252 // preferencs, we don't need to send this to ibus-daemon. |
242 } | 253 } |
243 if (!pref_name || *pref_name == prefs::kLanguagePreloadEngines) { | 254 if (!pref_name || *pref_name == prefs::kLanguagePreloadEngines) { |
244 SetLanguageConfigStringListAsCSV(kGeneralSectionName, | 255 SetLanguageConfigStringListAsCSV(language_prefs::kGeneralSectionName, |
245 kPreloadEnginesConfigName, | 256 language_prefs::kPreloadEnginesConfigName, |
246 language_preload_engines_.GetValue()); | 257 language_preload_engines_.GetValue()); |
247 } | 258 } |
248 for (size_t i = 0; i < kNumChewingBooleanPrefs; ++i) { | 259 for (size_t i = 0; i < language_prefs::kNumChewingBooleanPrefs; ++i) { |
249 if (!pref_name || *pref_name == kChewingBooleanPrefs[i].pref_name) { | 260 if (!pref_name || |
250 SetLanguageConfigBoolean(kChewingSectionName, | 261 *pref_name == language_prefs::kChewingBooleanPrefs[i].pref_name) { |
251 kChewingBooleanPrefs[i].ibus_config_name, | 262 SetLanguageConfigBoolean( |
252 language_chewing_boolean_prefs_[i].GetValue()); | 263 language_prefs::kChewingSectionName, |
| 264 language_prefs::kChewingBooleanPrefs[i].ibus_config_name, |
| 265 language_chewing_boolean_prefs_[i].GetValue()); |
253 } | 266 } |
254 } | 267 } |
255 for (size_t i = 0; i < kNumChewingMultipleChoicePrefs; ++i) { | 268 for (size_t i = 0; i < language_prefs::kNumChewingMultipleChoicePrefs; ++i) { |
256 if (!pref_name || *pref_name == kChewingMultipleChoicePrefs[i].pref_name) { | 269 if (!pref_name || |
| 270 *pref_name == |
| 271 language_prefs::kChewingMultipleChoicePrefs[i].pref_name) { |
257 SetLanguageConfigString( | 272 SetLanguageConfigString( |
258 kChewingSectionName, | 273 language_prefs::kChewingSectionName, |
259 kChewingMultipleChoicePrefs[i].ibus_config_name, | 274 language_prefs::kChewingMultipleChoicePrefs[i].ibus_config_name, |
260 language_chewing_multiple_choice_prefs_[i].GetValue()); | 275 language_chewing_multiple_choice_prefs_[i].GetValue()); |
261 } | 276 } |
262 } | 277 } |
263 if (!pref_name || *pref_name == kChewingHsuSelKeyType.pref_name) { | 278 if (!pref_name || |
| 279 *pref_name == language_prefs::kChewingHsuSelKeyType.pref_name) { |
264 SetLanguageConfigInteger( | 280 SetLanguageConfigInteger( |
265 kChewingSectionName, | 281 language_prefs::kChewingSectionName, |
266 kChewingHsuSelKeyType.ibus_config_name, | 282 language_prefs::kChewingHsuSelKeyType.ibus_config_name, |
267 language_chewing_hsu_sel_key_type_.GetValue()); | 283 language_chewing_hsu_sel_key_type_.GetValue()); |
268 } | 284 } |
269 for (size_t i = 0; i < kNumChewingIntegerPrefs; ++i) { | 285 for (size_t i = 0; i < language_prefs::kNumChewingIntegerPrefs; ++i) { |
270 if (!pref_name || *pref_name == kChewingIntegerPrefs[i].pref_name) { | 286 if (!pref_name || |
271 SetLanguageConfigInteger(kChewingSectionName, | 287 *pref_name == language_prefs::kChewingIntegerPrefs[i].pref_name) { |
272 kChewingIntegerPrefs[i].ibus_config_name, | 288 SetLanguageConfigInteger( |
273 language_chewing_integer_prefs_[i].GetValue()); | 289 language_prefs::kChewingSectionName, |
| 290 language_prefs::kChewingIntegerPrefs[i].ibus_config_name, |
| 291 language_chewing_integer_prefs_[i].GetValue()); |
274 } | 292 } |
275 } | 293 } |
276 if (!pref_name || *pref_name == prefs::kLanguageHangulKeyboard) { | 294 if (!pref_name || |
277 SetLanguageConfigString(kHangulSectionName, kHangulKeyboardConfigName, | 295 *pref_name == prefs::kLanguageHangulKeyboard) { |
| 296 SetLanguageConfigString(language_prefs::kHangulSectionName, |
| 297 language_prefs::kHangulKeyboardConfigName, |
278 language_hangul_keyboard_.GetValue()); | 298 language_hangul_keyboard_.GetValue()); |
279 } | 299 } |
280 if (!pref_name || *pref_name == prefs::kLanguageHangulHanjaKeys) { | 300 if (!pref_name || *pref_name == prefs::kLanguageHangulHanjaKeys) { |
281 SetLanguageConfigString(kHangulSectionName, kHangulHanjaKeysConfigName, | 301 SetLanguageConfigString(language_prefs::kHangulSectionName, |
| 302 language_prefs::kHangulHanjaKeysConfigName, |
282 language_hangul_hanja_keys_.GetValue()); | 303 language_hangul_hanja_keys_.GetValue()); |
283 } | 304 } |
284 for (size_t i = 0; i < kNumPinyinBooleanPrefs; ++i) { | 305 for (size_t i = 0; i < language_prefs::kNumPinyinBooleanPrefs; ++i) { |
285 if (!pref_name || *pref_name == kPinyinBooleanPrefs[i].pref_name) { | 306 if (!pref_name || |
286 SetLanguageConfigBoolean(kPinyinSectionName, | 307 *pref_name == language_prefs::kPinyinBooleanPrefs[i].pref_name) { |
287 kPinyinBooleanPrefs[i].ibus_config_name, | 308 SetLanguageConfigBoolean( |
288 language_pinyin_boolean_prefs_[i].GetValue()); | 309 language_prefs::kPinyinSectionName, |
| 310 language_prefs::kPinyinBooleanPrefs[i].ibus_config_name, |
| 311 language_pinyin_boolean_prefs_[i].GetValue()); |
289 } | 312 } |
290 } | 313 } |
291 for (size_t i = 0; i < kNumPinyinIntegerPrefs; ++i) { | 314 for (size_t i = 0; i < language_prefs::kNumPinyinIntegerPrefs; ++i) { |
292 if (!pref_name || *pref_name == kPinyinIntegerPrefs[i].pref_name) { | 315 if (!pref_name || |
293 SetLanguageConfigInteger(kPinyinSectionName, | 316 *pref_name == language_prefs::kPinyinIntegerPrefs[i].pref_name) { |
294 kPinyinIntegerPrefs[i].ibus_config_name, | 317 SetLanguageConfigInteger( |
295 language_pinyin_int_prefs_[i].GetValue()); | 318 language_prefs::kPinyinSectionName, |
| 319 language_prefs::kPinyinIntegerPrefs[i].ibus_config_name, |
| 320 language_pinyin_int_prefs_[i].GetValue()); |
296 } | 321 } |
297 } | 322 } |
298 if (!pref_name || *pref_name == kPinyinDoublePinyinSchema.pref_name) { | 323 if (!pref_name || |
| 324 *pref_name == language_prefs::kPinyinDoublePinyinSchema.pref_name) { |
299 SetLanguageConfigInteger( | 325 SetLanguageConfigInteger( |
300 kPinyinSectionName, | 326 language_prefs::kPinyinSectionName, |
301 kPinyinDoublePinyinSchema.ibus_config_name, | 327 language_prefs::kPinyinDoublePinyinSchema.ibus_config_name, |
302 language_pinyin_double_pinyin_schema_.GetValue()); | 328 language_pinyin_double_pinyin_schema_.GetValue()); |
303 } | 329 } |
304 for (size_t i = 0; i < kNumMozcBooleanPrefs; ++i) { | 330 for (size_t i = 0; i < language_prefs::kNumMozcBooleanPrefs; ++i) { |
305 if (!pref_name || *pref_name == kMozcBooleanPrefs[i].pref_name) { | 331 if (!pref_name || |
306 SetLanguageConfigBoolean(kMozcSectionName, | 332 *pref_name == language_prefs::kMozcBooleanPrefs[i].pref_name) { |
307 kMozcBooleanPrefs[i].ibus_config_name, | 333 SetLanguageConfigBoolean( |
308 language_mozc_boolean_prefs_[i].GetValue()); | 334 language_prefs::kMozcSectionName, |
| 335 language_prefs::kMozcBooleanPrefs[i].ibus_config_name, |
| 336 language_mozc_boolean_prefs_[i].GetValue()); |
309 } | 337 } |
310 } | 338 } |
311 for (size_t i = 0; i < kNumMozcMultipleChoicePrefs; ++i) { | 339 for (size_t i = 0; i < language_prefs::kNumMozcMultipleChoicePrefs; ++i) { |
312 if (!pref_name || *pref_name == kMozcMultipleChoicePrefs[i].pref_name) { | 340 if (!pref_name || |
| 341 *pref_name == language_prefs::kMozcMultipleChoicePrefs[i].pref_name) { |
313 SetLanguageConfigString( | 342 SetLanguageConfigString( |
314 kMozcSectionName, | 343 language_prefs::kMozcSectionName, |
315 kMozcMultipleChoicePrefs[i].ibus_config_name, | 344 language_prefs::kMozcMultipleChoicePrefs[i].ibus_config_name, |
316 language_mozc_multiple_choice_prefs_[i].GetValue()); | 345 language_mozc_multiple_choice_prefs_[i].GetValue()); |
317 } | 346 } |
318 } | 347 } |
319 for (size_t i = 0; i < kNumMozcIntegerPrefs; ++i) { | 348 for (size_t i = 0; i < language_prefs::kNumMozcIntegerPrefs; ++i) { |
320 if (!pref_name || *pref_name == kMozcIntegerPrefs[i].pref_name) { | 349 if (!pref_name || |
321 SetLanguageConfigInteger(kMozcSectionName, | 350 *pref_name == language_prefs::kMozcIntegerPrefs[i].pref_name) { |
322 kMozcIntegerPrefs[i].ibus_config_name, | 351 SetLanguageConfigInteger( |
323 language_mozc_integer_prefs_[i].GetValue()); | 352 language_prefs::kMozcSectionName, |
| 353 language_prefs::kMozcIntegerPrefs[i].ibus_config_name, |
| 354 language_mozc_integer_prefs_[i].GetValue()); |
324 } | 355 } |
325 } | 356 } |
326 if (!pref_name || (*pref_name == prefs::kLanguageXkbRemapSearchKeyTo || | 357 if (!pref_name || (*pref_name == prefs::kLanguageXkbRemapSearchKeyTo || |
327 *pref_name == prefs::kLanguageXkbRemapControlKeyTo || | 358 *pref_name == prefs::kLanguageXkbRemapControlKeyTo || |
328 *pref_name == prefs::kLanguageXkbRemapAltKeyTo)) { | 359 *pref_name == prefs::kLanguageXkbRemapAltKeyTo)) { |
329 UpdateModifierKeyMapping(); | 360 UpdateModifierKeyMapping(); |
330 } | 361 } |
331 if (!pref_name || *pref_name == prefs::kLanguageXkbAutoRepeatEnabled) { | 362 if (!pref_name || *pref_name == prefs::kLanguageXkbAutoRepeatEnabled) { |
332 const bool enabled = language_xkb_auto_repeat_enabled_.GetValue(); | 363 const bool enabled = language_xkb_auto_repeat_enabled_.GetValue(); |
333 CrosLibrary::Get()->GetKeyboardLibrary()->SetAutoRepeatEnabled(enabled); | 364 CrosLibrary::Get()->GetKeyboardLibrary()->SetAutoRepeatEnabled(enabled); |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
420 AutoRepeatRate rate; | 451 AutoRepeatRate rate; |
421 rate.initial_delay_in_ms = language_xkb_auto_repeat_delay_pref_.GetValue(); | 452 rate.initial_delay_in_ms = language_xkb_auto_repeat_delay_pref_.GetValue(); |
422 rate.repeat_interval_in_ms = | 453 rate.repeat_interval_in_ms = |
423 language_xkb_auto_repeat_interval_pref_.GetValue(); | 454 language_xkb_auto_repeat_interval_pref_.GetValue(); |
424 DCHECK(rate.initial_delay_in_ms > 0); | 455 DCHECK(rate.initial_delay_in_ms > 0); |
425 DCHECK(rate.repeat_interval_in_ms > 0); | 456 DCHECK(rate.repeat_interval_in_ms > 0); |
426 CrosLibrary::Get()->GetKeyboardLibrary()->SetAutoRepeatRate(rate); | 457 CrosLibrary::Get()->GetKeyboardLibrary()->SetAutoRepeatRate(rate); |
427 } | 458 } |
428 | 459 |
429 } // namespace chromeos | 460 } // namespace chromeos |
OLD | NEW |