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

Unified Diff: chrome/browser/chromeos/cros/input_method_library.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
« no previous file with comments | « no previous file | chrome/browser/chromeos/dom_ui/language_chewing_options_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/cros/input_method_library.cc
diff --git a/chrome/browser/chromeos/cros/input_method_library.cc b/chrome/browser/chromeos/cros/input_method_library.cc
index e4a53b3225da53a4e65c34a2d38f202d71f6af1f..d3c51b7a9923a4e7df22be4184d9be5400223bad 100644
--- a/chrome/browser/chromeos/cros/input_method_library.cc
+++ b/chrome/browser/chromeos/cros/input_method_library.cc
@@ -50,7 +50,7 @@ class InputMethodLibraryImpl : public InputMethodLibrary {
ime_running_(false),
ime_connected_(false),
defer_ime_startup_(false),
- active_input_method_(kHardwareKeyboardLayout),
+ active_input_method_(language_prefs::kHardwareKeyboardLayout),
need_input_method_set_(false),
ime_handle_(0),
candidate_window_handle_(0),
@@ -105,7 +105,7 @@ class InputMethodLibraryImpl : public InputMethodLibrary {
void ChangeInputMethod(const std::string& input_method_id) {
active_input_method_ = input_method_id;
if (EnsureLoadedAndStarted()) {
- if (input_method_id != kHardwareKeyboardLayout) {
+ if (input_method_id != language_prefs::kHardwareKeyboardLayout) {
StartInputMethodProcesses();
}
chromeos::ChangeInputMethod(
@@ -171,12 +171,13 @@ class InputMethodLibraryImpl : public InputMethodLibrary {
const char* section,
const char* config_name,
const ImeConfigValue& value) {
- if (!strcmp(kGeneralSectionName, section) &&
- !strcmp(kPreloadEnginesConfigName, config_name)) {
+ if (!strcmp(language_prefs::kGeneralSectionName, section) &&
+ !strcmp(language_prefs::kPreloadEnginesConfigName, config_name)) {
if (EnsureLoadedAndStarted()) {
if (value.type == ImeConfigValue::kValueTypeStringList &&
value.string_list_value.size() == 1 &&
- value.string_list_value[0] == kHardwareKeyboardLayout) {
+ value.string_list_value[0] ==
+ language_prefs::kHardwareKeyboardLayout) {
StopInputMethodProcesses();
} else if (!defer_ime_startup_) {
StartInputMethodProcesses();
@@ -201,7 +202,7 @@ class InputMethodLibraryImpl : public InputMethodLibrary {
config_name.c_str(),
value)) {
// Check if it's a change in active input methods.
- if (config_name == kPreloadEnginesConfigName) {
+ if (config_name == language_prefs::kPreloadEnginesConfigName) {
active_input_methods_are_changed = true;
}
// Successfully sent. Remove the command and proceed to the next one.
@@ -450,7 +451,7 @@ class InputMethodLibraryImpl : public InputMethodLibrary {
ime_running_ = false;
if (ime_handle_) {
chromeos::ChangeInputMethod(input_method_status_connection_,
- kHardwareKeyboardLayout);
+ language_prefs::kHardwareKeyboardLayout);
kill(ime_handle_, SIGTERM);
ime_handle_ = 0;
}
« no previous file with comments | « no previous file | chrome/browser/chromeos/dom_ui/language_chewing_options_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698