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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/language_preferences.cc

Issue 8746006: Remove IDS_MOZC macro. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/language_preferences.cc
diff --git a/chrome/browser/chromeos/language_preferences.cc b/chrome/browser/chromeos/language_preferences.cc
index 559b253a8357b2d144c3102d460bfb162fd95da6..27f18a73433f14790925d9f10eeb967f48234a71 100644
--- a/chrome/browser/chromeos/language_preferences.cc
+++ b/chrome/browser/chromeos/language_preferences.cc
@@ -237,29 +237,26 @@ COMPILE_ASSERT(kNumPinyinIntegerPrefs == arraysize(kPinyinIntegerPrefs),
// ---------------------------------------------------------------------------
const char kMozcSectionName[] = "engine/Mozc";
-#define IDS_MOZC(suffix) \
- IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_##suffix
-
const LanguageBooleanPrefs kMozcBooleanPrefs[] = {
{ prefs::kLanguageMozcIncognitoMode,
false,
"incognito_mode",
- IDS_MOZC(INCOGNITO_MODE),
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_INCOGNITO_MODE,
PrefService::SYNCABLE_PREF },
{ prefs::kLanguageMozcUseAutoImeTurnOff,
true,
"use_auto_ime_turn_off",
- IDS_MOZC(USE_AUTO_IME_TURN_OFF),
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_USE_AUTO_IME_TURN_OFF,
PrefService::SYNCABLE_PREF },
{ prefs::kLanguageMozcUseHistorySuggest,
true,
"use_history_suggest",
- IDS_MOZC(USE_HISTORY_SUGGEST),
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_USE_HISTORY_SUGGEST,
PrefService::SYNCABLE_PREF },
{ prefs::kLanguageMozcUseDictionarySuggest,
true,
"use_dictionary_suggest",
- IDS_MOZC(USE_DICTIONARY_SUGGEST),
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_USE_DICTIONARY_SUGGEST,
PrefService::SYNCABLE_PREF },
};
COMPILE_ASSERT(kNumMozcBooleanPrefs == arraysize(kMozcBooleanPrefs),
@@ -270,71 +267,71 @@ extern const LanguageMultipleChoicePreference<const char*>
{ prefs::kLanguageMozcPreeditMethod,
"ROMAN",
"preedit_method",
- {{ "ROMAN", IDS_MOZC(PREEDIT_METHOD_ROMAN) },
- { "KANA", IDS_MOZC(PREEDIT_METHOD_KANA) }},
- IDS_MOZC(PREEDIT_METHOD),
+ {{ "ROMAN", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_PREEDIT_METHOD_ROMAN },
+ { "KANA", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_PREEDIT_METHOD_KANA }},
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_PREEDIT_METHOD,
PrefService::SYNCABLE_PREF,
},
{ prefs::kLanguageMozcSessionKeymap,
"MSIME",
"session_keymap",
- {{ "ATOK", IDS_MOZC(SESSION_KEYMAP_ATOK) },
- { "MSIME", IDS_MOZC(SESSION_KEYMAP_MSIME) },
- { "KOTOERI", IDS_MOZC(SESSION_KEYMAP_KOTOERI) }},
+ {{ "ATOK", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SESSION_KEYMAP_ATOK },
+ { "MSIME", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SESSION_KEYMAP_MSIME },
+ { "KOTOERI", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SESSION_KEYMAP_KOTOERI }},
// TODO: Support "CUSTOM" keymap.
- IDS_MOZC(SESSION_KEYMAP),
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SESSION_KEYMAP,
PrefService::SYNCABLE_PREF,
},
{ prefs::kLanguageMozcPunctuationMethod,
"KUTEN_TOUTEN",
"punctuation_method",
{{ "KUTEN_TOUTEN",
- IDS_MOZC(PUNCTUATION_METHOD_KUTEN_TOUTEN) },
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_PUNCTUATION_METHOD_KUTEN_TOUTEN },
{ "COMMA_PERIOD",
- IDS_MOZC(PUNCTUATION_METHOD_COMMA_PERIOD) },
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_PUNCTUATION_METHOD_COMMA_PERIOD },
{ "KUTEN_PERIOD",
- IDS_MOZC(PUNCTUATION_METHOD_KUTEN_PERIOD) },
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_PUNCTUATION_METHOD_KUTEN_PERIOD },
{ "COMMA_TOUTEN",
- IDS_MOZC(PUNCTUATION_METHOD_COMMA_TOUTEN) }},
- IDS_MOZC(PUNCTUATION_METHOD),
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_PUNCTUATION_METHOD_COMMA_TOUTEN }},
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_PUNCTUATION_METHOD,
PrefService::SYNCABLE_PREF,
},
{ prefs::kLanguageMozcSymbolMethod,
"CORNER_BRACKET_MIDDLE_DOT",
"symbol_method",
{{ "CORNER_BRACKET_MIDDLE_DOT",
- IDS_MOZC(SYMBOL_METHOD_CORNER_BRACKET_MIDDLE_DOT) },
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SYMBOL_METHOD_CORNER_BRACKET_MIDDLE_DOT },
{ "SQUARE_BRACKET_SLASH",
- IDS_MOZC(SYMBOL_METHOD_SQUARE_BRACKET_SLASH) },
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SYMBOL_METHOD_SQUARE_BRACKET_SLASH },
{ "CORNER_BRACKET_SLASH",
- IDS_MOZC(SYMBOL_METHOD_CORNER_BRACKET_SLASH) },
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SYMBOL_METHOD_CORNER_BRACKET_SLASH },
{ "SQUARE_BRACKET_MIDDLE_DOT",
- IDS_MOZC(SYMBOL_METHOD_SQUARE_BRACKET_MIDDLE_DOT) }},
- IDS_MOZC(SYMBOL_METHOD),
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SYMBOL_METHOD_SQUARE_BRACKET_MIDDLE_DOT }},
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SYMBOL_METHOD,
PrefService::SYNCABLE_PREF,
},
{ prefs::kLanguageMozcSpaceCharacterForm,
"FUNDAMENTAL_INPUT_MODE",
"space_character_form",
{{ "FUNDAMENTAL_INPUT_MODE",
- IDS_MOZC(SPACE_CHARACTER_FORM_FUNDAMENTAL_INPUT_MODE) },
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SPACE_CHARACTER_FORM_FUNDAMENTAL_INPUT_MODE },
{ "FUNDAMENTAL_FULL_WIDTH",
- IDS_MOZC(SPACE_CHARACTER_FORM_FUNDAMENTAL_FULL_WIDTH) },
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SPACE_CHARACTER_FORM_FUNDAMENTAL_FULL_WIDTH },
{ "FUNDAMENTAL_HALF_WIDTH",
- IDS_MOZC(SPACE_CHARACTER_FORM_FUNDAMENTAL_HALF_WIDTH) }},
- IDS_MOZC(SPACE_CHARACTER_FORM),
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SPACE_CHARACTER_FORM_FUNDAMENTAL_HALF_WIDTH }},
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SPACE_CHARACTER_FORM,
PrefService::SYNCABLE_PREF,
},
{ prefs::kLanguageMozcHistoryLearningLevel,
"DEFAULT_HISTORY",
"history_learning_level",
{{ "DEFAULT_HISTORY",
- IDS_MOZC(HISTORY_LEARNING_LEVEL_DEFAULT_HISTORY) },
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_HISTORY_LEARNING_LEVEL_DEFAULT_HISTORY },
{ "READ_ONLY",
- IDS_MOZC(HISTORY_LEARNING_LEVEL_READ_ONLY) },
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_HISTORY_LEARNING_LEVEL_READ_ONLY },
{ "NO_HISTORY",
- IDS_MOZC(HISTORY_LEARNING_LEVEL_NO_HISTORY) }},
- IDS_MOZC(HISTORY_LEARNING_LEVEL),
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_HISTORY_LEARNING_LEVEL_NO_HISTORY }},
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_HISTORY_LEARNING_LEVEL,
PrefService::SYNCABLE_PREF,
},
// TODO(mazda): Uncomment this block once the candidate window in Chrome OS
@@ -343,38 +340,38 @@ extern const LanguageMultipleChoicePreference<const char*>
// "SHORTCUT_123456789",
// "selection_shortcut",
// {{ "NO_SHORTCUT",
- // IDS_MOZC(SELECTION_SHORTCUT_NO_SHORTCUT) },
+ // IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SELECTION_SHORTCUT_NO_SHORTCUT },
// { "SHORTCUT_123456789",
- // IDS_MOZC(SELECTION_SHORTCUT_SHORTCUT_123456789) },
+ // IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SELECTION_SHORTCUT_SHORTCUT_123456789 },
// { "SHORTCUT_ASDFGHJKL",
- // IDS_MOZC(SELECTION_SHORTCUT_SHORTCUT_ASDFGHJKL) }},
- // IDS_MOZC(SELECTION_SHORTCUT),
+ // IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SELECTION_SHORTCUT_SHORTCUT_ASDFGHJKL }},
+ // IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SELECTION_SHORTCUT,
// PrefService::SYNCABLE_PREF,
// },
{ prefs::kLanguageMozcShiftKeyModeSwitch,
"ASCII_INPUT_MODE",
"shift_key_mode_switch",
{{ "OFF",
- IDS_MOZC(SHIFT_KEY_MODE_SWITCH_OFF) },
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SHIFT_KEY_MODE_SWITCH_OFF },
{ "ASCII_INPUT_MODE",
- IDS_MOZC(SHIFT_KEY_MODE_SWITCH_ASCII_INPUT_MODE) },
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SHIFT_KEY_MODE_SWITCH_ASCII_INPUT_MODE },
{ "KATAKANA_INPUT_MODE",
- IDS_MOZC(SHIFT_KEY_MODE_SWITCH_KATAKANA_INPUT_MODE) }},
- IDS_MOZC(SHIFT_KEY_MODE_SWITCH),
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SHIFT_KEY_MODE_SWITCH_KATAKANA_INPUT_MODE }},
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SHIFT_KEY_MODE_SWITCH,
PrefService::SYNCABLE_PREF,
},
{ prefs::kLanguageMozcNumpadCharacterForm,
"NUMPAD_HALF_WIDTH",
"numpad_character_form",
{{ "NUMPAD_INPUT_MODE",
- IDS_MOZC(NUMPAD_CHARACTER_FORM_NUMPAD_INPUT_MODE) },
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_NUMPAD_CHARACTER_FORM_NUMPAD_INPUT_MODE },
{ "NUMPAD_FULL_WIDTH",
- IDS_MOZC(NUMPAD_CHARACTER_FORM_NUMPAD_FULL_WIDTH) },
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_NUMPAD_CHARACTER_FORM_NUMPAD_FULL_WIDTH },
{ "NUMPAD_HALF_WIDTH",
- IDS_MOZC(NUMPAD_CHARACTER_FORM_NUMPAD_HALF_WIDTH) },
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_NUMPAD_CHARACTER_FORM_NUMPAD_HALF_WIDTH },
{ "NUMPAD_DIRECT_INPUT",
- IDS_MOZC(NUMPAD_CHARACTER_FORM_NUMPAD_DIRECT_INPUT) }},
- IDS_MOZC(NUMPAD_CHARACTER_FORM),
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_NUMPAD_CHARACTER_FORM_NUMPAD_DIRECT_INPUT }},
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_NUMPAD_CHARACTER_FORM,
PrefService::SYNCABLE_PREF,
},
};
@@ -384,13 +381,12 @@ COMPILE_ASSERT(kNumMozcMultipleChoicePrefs ==
const LanguageIntegerRangePreference kMozcIntegerPrefs[] = {
{ prefs::kLanguageMozcSuggestionsSize, 3, 1, 9, "suggestions_size",
- IDS_MOZC(SUGGESTIONS_SIZE), PrefService::SYNCABLE_PREF }
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SUGGESTIONS_SIZE,
+ PrefService::SYNCABLE_PREF }
};
COMPILE_ASSERT(kNumMozcIntegerPrefs == arraysize(kMozcIntegerPrefs),
TheSizeShouldMatch);
-#undef IDS_MOZC
-
// ---------------------------------------------------------------------------
// For keyboard stuff
// ---------------------------------------------------------------------------
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698