Add language_prefs namespace to language_preferences.h.

chrome/browser/chromeos/cros/input_method_library.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/cros/input_method_library.h"
 
 #include <glib.h>
 #include <signal.h>
 
 #include "unicode/uloc.h"
@@ skipping 32 matching lines @@
 
 class InputMethodLibraryImpl : public InputMethodLibrary {
  public:
   InputMethodLibraryImpl()
       : input_method_status_connection_(NULL),
         previous_input_method_("", "", "", ""),
         current_input_method_("", "", "", ""),
         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),
         failure_count_(0) {
     scoped_ptr<InputMethodDescriptors> input_method_descriptors(
         CreateFallbackInputMethodDescriptors());
     current_input_method_ = input_method_descriptors->at(0);
   }
 
   ~InputMethodLibraryImpl() {
@@ skipping 34 matching lines @@
     }
     if (!result || result->empty()) {
       result = CreateFallbackInputMethodDescriptors();
     }
     return result;
   }
 
   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(
           input_method_status_connection_, input_method_id.c_str());
     }
   }
 
   void SetImePropertyActivated(const std::string& key, bool activated) {
     DCHECK(!key.empty());
     if (EnsureLoadedAndStarted()) {
@@ skipping 45 matching lines @@
 
   virtual const ImePropertyList& current_ime_properties() const {
     return current_ime_properties_;
   }
 
  private:
   void MaybeUpdateImeState(
       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();
         }
         chromeos::SetActiveInputMethods(input_method_status_connection_, value);
       }
     }
   }
 
   void FlushImeConfig() {
     bool active_input_methods_are_changed = false;
     bool completed = false;
     if (EnsureLoadedAndStarted()) {
       InputMethodConfigRequests::iterator iter =
           pending_config_requests_.begin();
       while (iter != pending_config_requests_.end()) {
         const std::string& section = iter->first.first;
         const std::string& config_name = iter->first.second;
         const ImeConfigValue& value = iter->second;
         if (chromeos::SetImeConfig(input_method_status_connection_,
                                    section.c_str(),
                                    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.
           pending_config_requests_.erase(iter++);
         } else {
           // If SetImeConfig() fails, subsequent calls will likely fail.
           break;
         }
       }
       if (pending_config_requests_.empty()) {
@@ skipping 228 matching lines @@
       library->candidate_window_handle_ = 0;
     }
 
     library->MaybeLaunchIme();
   }
 
   void StopInputMethodProcesses() {
     ime_running_ = false;
     if (ime_handle_) {
       chromeos::ChangeInputMethod(input_method_status_connection_,
-                                  kHardwareKeyboardLayout);
+                                  language_prefs::kHardwareKeyboardLayout);
       kill(ime_handle_, SIGTERM);
       ime_handle_ = 0;
     }
     if (candidate_window_handle_) {
       kill(candidate_window_handle_, SIGTERM);
       candidate_window_handle_ = 0;
     }
   }
 
   void SetDeferImeStartup(bool defer) {
@@ skipping 249 matching lines @@
     return new InputMethodLibraryStubImpl();
   else
     return new InputMethodLibraryImpl();
 }
 
 }  // namespace chromeos
 
 // Allows InvokeLater without adding refcounting. This class is a Singleton and
 // won't be deleted until it's last InvokeLater is run.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::InputMethodLibraryImpl);