OLD | NEW |
---|---|
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. |
tfarina (gmail-do not use)
2010/04/27 18:14:21
nit: 2010
| |
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/chromeos/cros/cros_library.h" | 9 #include "chrome/browser/chromeos/cros/cros_library.h" |
10 #include "chrome/browser/chromeos/cros/language_library.h" | 10 #include "chrome/browser/chromeos/cros/language_library.h" |
11 #include "chrome/browser/chromeos/cros/synaptics_library.h" | 11 #include "chrome/browser/chromeos/cros/synaptics_library.h" |
(...skipping 13 matching lines...) Expand all Loading... | |
25 prefs->RegisterIntegerPref(prefs::kTouchpadSpeedFactor, 5); | 25 prefs->RegisterIntegerPref(prefs::kTouchpadSpeedFactor, 5); |
26 prefs->RegisterIntegerPref(prefs::kTouchpadSensitivity, 5); | 26 prefs->RegisterIntegerPref(prefs::kTouchpadSensitivity, 5); |
27 prefs->RegisterBooleanPref(prefs::kLanguageUseGlobalEngine, true); | 27 prefs->RegisterBooleanPref(prefs::kLanguageUseGlobalEngine, true); |
28 prefs->RegisterStringPref(prefs::kLanguageHotkeyNextEngine, | 28 prefs->RegisterStringPref(prefs::kLanguageHotkeyNextEngine, |
29 kHotkeyNextEngine); | 29 kHotkeyNextEngine); |
30 prefs->RegisterStringPref(prefs::kLanguageHotkeyTrigger, kHotkeyTrigger); | 30 prefs->RegisterStringPref(prefs::kLanguageHotkeyTrigger, kHotkeyTrigger); |
31 prefs->RegisterStringPref(prefs::kLanguagePreloadEngines, | 31 prefs->RegisterStringPref(prefs::kLanguagePreloadEngines, |
32 UTF8ToWide(kFallbackInputMethodId)); // EN layout | 32 UTF8ToWide(kFallbackInputMethodId)); // EN layout |
33 prefs->RegisterStringPref(prefs::kLanguageHangulKeyboard, | 33 prefs->RegisterStringPref(prefs::kLanguageHangulKeyboard, |
34 kHangulKeyboardNameIDPairs[0].keyboard_id); | 34 kHangulKeyboardNameIDPairs[0].keyboard_id); |
35 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kPinyinBooleanPrefs); ++i) { | 35 for (size_t i = 0; i < kNumPinyinBooleanPrefs; ++i) { |
36 prefs->RegisterBooleanPref(kPinyinBooleanPrefs[i].pref_name, | 36 prefs->RegisterBooleanPref(kPinyinBooleanPrefs[i].pref_name, |
37 kPinyinBooleanPrefs[i].default_value); | 37 kPinyinBooleanPrefs[i].default_value); |
38 } | 38 } |
39 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kPinyinIntegerPrefs); ++i) { | 39 for (size_t i = 0; i < kNumPinyinIntegerPrefs; ++i) { |
40 prefs->RegisterIntegerPref(kPinyinIntegerPrefs[i].pref_name, | 40 prefs->RegisterIntegerPref(kPinyinIntegerPrefs[i].pref_name, |
41 kPinyinIntegerPrefs[i].default_value); | 41 kPinyinIntegerPrefs[i].default_value); |
42 } | 42 } |
43 } | 43 } |
44 | 44 |
45 void Preferences::Init(PrefService* prefs) { | 45 void Preferences::Init(PrefService* prefs) { |
46 timezone_.Init(prefs::kTimeZone, prefs, this); | 46 timezone_.Init(prefs::kTimeZone, prefs, this); |
47 tap_to_click_enabled_.Init(prefs::kTapToClickEnabled, prefs, this); | 47 tap_to_click_enabled_.Init(prefs::kTapToClickEnabled, prefs, this); |
48 vert_edge_scroll_enabled_.Init(prefs::kVertEdgeScrollEnabled, prefs, this); | 48 vert_edge_scroll_enabled_.Init(prefs::kVertEdgeScrollEnabled, prefs, this); |
49 speed_factor_.Init(prefs::kTouchpadSpeedFactor, prefs, this); | 49 speed_factor_.Init(prefs::kTouchpadSpeedFactor, prefs, this); |
50 sensitivity_.Init(prefs::kTouchpadSensitivity, prefs, this); | 50 sensitivity_.Init(prefs::kTouchpadSensitivity, prefs, this); |
51 language_use_global_engine_.Init( | 51 language_use_global_engine_.Init( |
52 prefs::kLanguageUseGlobalEngine, prefs, this); | 52 prefs::kLanguageUseGlobalEngine, prefs, this); |
53 language_hotkey_next_engine_.Init( | 53 language_hotkey_next_engine_.Init( |
54 prefs::kLanguageHotkeyNextEngine, prefs, this); | 54 prefs::kLanguageHotkeyNextEngine, prefs, this); |
55 language_hotkey_trigger_.Init(prefs::kLanguageHotkeyTrigger, prefs, this); | 55 language_hotkey_trigger_.Init(prefs::kLanguageHotkeyTrigger, prefs, this); |
56 language_preload_engines_.Init(prefs::kLanguagePreloadEngines, prefs, this); | 56 language_preload_engines_.Init(prefs::kLanguagePreloadEngines, prefs, this); |
57 language_hangul_keyboard_.Init(prefs::kLanguageHangulKeyboard, prefs, this); | 57 language_hangul_keyboard_.Init(prefs::kLanguageHangulKeyboard, prefs, this); |
58 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kPinyinBooleanPrefs); ++i) { | 58 for (size_t i = 0; i < kNumPinyinBooleanPrefs; ++i) { |
59 language_pinyin_boolean_prefs_[i].Init( | 59 language_pinyin_boolean_prefs_[i].Init( |
60 kPinyinBooleanPrefs[i].pref_name, prefs, this); | 60 kPinyinBooleanPrefs[i].pref_name, prefs, this); |
61 } | 61 } |
62 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kPinyinIntegerPrefs); ++i) { | 62 for (size_t i = 0; i < kNumPinyinIntegerPrefs; ++i) { |
63 language_pinyin_int_prefs_[i].Init( | 63 language_pinyin_int_prefs_[i].Init( |
64 kPinyinIntegerPrefs[i].pref_name, prefs, this); | 64 kPinyinIntegerPrefs[i].pref_name, prefs, this); |
65 } | 65 } |
66 | 66 |
67 // Initialize touchpad settings to what's saved in user preferences. | 67 // Initialize touchpad settings to what's saved in user preferences. |
68 NotifyPrefChanged(NULL); | 68 NotifyPrefChanged(NULL); |
69 } | 69 } |
70 | 70 |
71 void Preferences::Observe(NotificationType type, | 71 void Preferences::Observe(NotificationType type, |
72 const NotificationSource& source, | 72 const NotificationSource& source, |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
105 SetLanguageConfigStringListAsCSV(kHotKeySectionName, | 105 SetLanguageConfigStringListAsCSV(kHotKeySectionName, |
106 kTriggerConfigName, | 106 kTriggerConfigName, |
107 language_hotkey_trigger_.GetValue()); | 107 language_hotkey_trigger_.GetValue()); |
108 if (!pref_name || *pref_name == prefs::kLanguagePreloadEngines) | 108 if (!pref_name || *pref_name == prefs::kLanguagePreloadEngines) |
109 SetLanguageConfigStringListAsCSV(kGeneralSectionName, | 109 SetLanguageConfigStringListAsCSV(kGeneralSectionName, |
110 kPreloadEnginesConfigName, | 110 kPreloadEnginesConfigName, |
111 language_preload_engines_.GetValue()); | 111 language_preload_engines_.GetValue()); |
112 if (!pref_name || *pref_name == prefs::kLanguageHangulKeyboard) | 112 if (!pref_name || *pref_name == prefs::kLanguageHangulKeyboard) |
113 SetLanguageConfigString(kHangulSectionName, kHangulKeyboardConfigName, | 113 SetLanguageConfigString(kHangulSectionName, kHangulKeyboardConfigName, |
114 language_hangul_keyboard_.GetValue()); | 114 language_hangul_keyboard_.GetValue()); |
115 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kPinyinBooleanPrefs); ++i) { | 115 for (size_t i = 0; i < kNumPinyinBooleanPrefs; ++i) { |
116 if (!pref_name || *pref_name == kPinyinBooleanPrefs[i].pref_name) { | 116 if (!pref_name || *pref_name == kPinyinBooleanPrefs[i].pref_name) { |
117 SetLanguageConfigBoolean(kPinyinSectionName, | 117 SetLanguageConfigBoolean(kPinyinSectionName, |
118 kPinyinBooleanPrefs[i].ibus_config_name, | 118 kPinyinBooleanPrefs[i].ibus_config_name, |
119 language_pinyin_boolean_prefs_[i].GetValue()); | 119 language_pinyin_boolean_prefs_[i].GetValue()); |
120 } | 120 } |
121 } | 121 } |
122 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kPinyinIntegerPrefs); ++i) { | 122 for (size_t i = 0; i < kNumPinyinIntegerPrefs; ++i) { |
123 if (!pref_name || *pref_name == kPinyinIntegerPrefs[i].pref_name) { | 123 if (!pref_name || *pref_name == kPinyinIntegerPrefs[i].pref_name) { |
124 SetLanguageConfigInteger(kPinyinSectionName, | 124 SetLanguageConfigInteger(kPinyinSectionName, |
125 kPinyinIntegerPrefs[i].ibus_config_name, | 125 kPinyinIntegerPrefs[i].ibus_config_name, |
126 language_pinyin_int_prefs_[i].GetValue()); | 126 language_pinyin_int_prefs_[i].GetValue()); |
127 } | 127 } |
128 } | 128 } |
129 } | 129 } |
130 | 130 |
131 void Preferences::SetTimeZone(const std::wstring& id) { | 131 void Preferences::SetTimeZone(const std::wstring& id) { |
132 icu::TimeZone* timezone = icu::TimeZone::createTimeZone( | 132 icu::TimeZone* timezone = icu::TimeZone::createTimeZone( |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
181 std::vector<std::wstring> split_values; | 181 std::vector<std::wstring> split_values; |
182 if (!value.empty()) { | 182 if (!value.empty()) { |
183 SplitString(value, L',', &split_values); | 183 SplitString(value, L',', &split_values); |
184 } | 184 } |
185 // We should call the cros API even when |value| is empty, to disable default | 185 // We should call the cros API even when |value| is empty, to disable default |
186 // config. | 186 // config. |
187 SetLanguageConfigStringList(section, name, split_values); | 187 SetLanguageConfigStringList(section, name, split_values); |
188 } | 188 } |
189 | 189 |
190 } // namespace chromeos | 190 } // namespace chromeos |
OLD | NEW |