| Index: chrome/browser/chromeos/preferences.cc
|
| diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
|
| index a1e62a0186374d8839db54c7b9df01448164dede..63d233a69297d685313803a76b14ce650108935b 100644
|
| --- a/chrome/browser/chromeos/preferences.cc
|
| +++ b/chrome/browser/chromeos/preferences.cc
|
| @@ -32,11 +32,11 @@ void Preferences::RegisterUserPrefs(PrefService* prefs) {
|
| UTF8ToWide(kFallbackInputMethodId)); // EN layout
|
| prefs->RegisterStringPref(prefs::kLanguageHangulKeyboard,
|
| kHangulKeyboardNameIDPairs[0].keyboard_id);
|
| - for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kPinyinBooleanPrefs); ++i) {
|
| + for (size_t i = 0; i < kNumPinyinBooleanPrefs; ++i) {
|
| prefs->RegisterBooleanPref(kPinyinBooleanPrefs[i].pref_name,
|
| kPinyinBooleanPrefs[i].default_value);
|
| }
|
| - for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kPinyinIntegerPrefs); ++i) {
|
| + for (size_t i = 0; i < kNumPinyinIntegerPrefs; ++i) {
|
| prefs->RegisterIntegerPref(kPinyinIntegerPrefs[i].pref_name,
|
| kPinyinIntegerPrefs[i].default_value);
|
| }
|
| @@ -55,11 +55,11 @@ void Preferences::Init(PrefService* prefs) {
|
| language_hotkey_trigger_.Init(prefs::kLanguageHotkeyTrigger, prefs, this);
|
| language_preload_engines_.Init(prefs::kLanguagePreloadEngines, prefs, this);
|
| language_hangul_keyboard_.Init(prefs::kLanguageHangulKeyboard, prefs, this);
|
| - for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kPinyinBooleanPrefs); ++i) {
|
| + for (size_t i = 0; i < kNumPinyinBooleanPrefs; ++i) {
|
| language_pinyin_boolean_prefs_[i].Init(
|
| kPinyinBooleanPrefs[i].pref_name, prefs, this);
|
| }
|
| - for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kPinyinIntegerPrefs); ++i) {
|
| + for (size_t i = 0; i < kNumPinyinIntegerPrefs; ++i) {
|
| language_pinyin_int_prefs_[i].Init(
|
| kPinyinIntegerPrefs[i].pref_name, prefs, this);
|
| }
|
| @@ -112,14 +112,14 @@ void Preferences::NotifyPrefChanged(const std::wstring* pref_name) {
|
| if (!pref_name || *pref_name == prefs::kLanguageHangulKeyboard)
|
| SetLanguageConfigString(kHangulSectionName, kHangulKeyboardConfigName,
|
| language_hangul_keyboard_.GetValue());
|
| - for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kPinyinBooleanPrefs); ++i) {
|
| + for (size_t i = 0; i < kNumPinyinBooleanPrefs; ++i) {
|
| if (!pref_name || *pref_name == kPinyinBooleanPrefs[i].pref_name) {
|
| SetLanguageConfigBoolean(kPinyinSectionName,
|
| kPinyinBooleanPrefs[i].ibus_config_name,
|
| language_pinyin_boolean_prefs_[i].GetValue());
|
| }
|
| }
|
| - for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kPinyinIntegerPrefs); ++i) {
|
| + for (size_t i = 0; i < kNumPinyinIntegerPrefs; ++i) {
|
| if (!pref_name || *pref_name == kPinyinIntegerPrefs[i].pref_name) {
|
| SetLanguageConfigInteger(kPinyinSectionName,
|
| kPinyinIntegerPrefs[i].ibus_config_name,
|
|
|