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

Unified Diff: chrome/browser/chromeos/input_method/input_method_util.cc

Issue 3132023: Add language_prefs namespace to language_preferences.h. (Closed)
Patch Set: address comments Created 10 years, 4 months 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
Index: chrome/browser/chromeos/input_method/input_method_util.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_util.cc b/chrome/browser/chromeos/input_method/input_method_util.cc
index ee03a60e14c5471b7fd775f52b45c28044ed3485..8248ae187f17c1dc3072c54899e6078f40bff1f2 100644
--- a/chrome/browser/chromeos/input_method/input_method_util.cc
+++ b/chrome/browser/chromeos/input_method/input_method_util.cc
@@ -560,8 +560,8 @@ void EnableInputMethods(const std::string& language_code, InputMethodType type,
GetInputMethodIdsFromLanguageCode(language_code, type, &input_method_ids);
if (std::count(input_method_ids.begin(), input_method_ids.end(),
- kHardwareKeyboardLayout) == 0) {
- input_method_ids.push_back(kHardwareKeyboardLayout);
+ language_prefs::kHardwareKeyboardLayout) == 0) {
+ input_method_ids.push_back(language_prefs::kHardwareKeyboardLayout);
}
// First, sort the vector by input method id, then by its display name.
std::sort(input_method_ids.begin(), input_method_ids.end());
@@ -572,7 +572,8 @@ void EnableInputMethods(const std::string& language_code, InputMethodType type,
value.type = ImeConfigValue::kValueTypeStringList;
value.string_list_value = input_method_ids;
InputMethodLibrary* library = CrosLibrary::Get()->GetInputMethodLibrary();
- library->SetImeConfig(kGeneralSectionName, kPreloadEnginesConfigName, value);
+ library->SetImeConfig(language_prefs::kGeneralSectionName,
+ language_prefs::kPreloadEnginesConfigName, value);
if (!initial_input_method_id.empty()) {
library->ChangeInputMethod(initial_input_method_id);
}
« no previous file with comments | « chrome/browser/chromeos/dom_ui/system_options_handler.cc ('k') | chrome/browser/chromeos/language_preferences.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698