Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / input_method / input_method_manager_impl.h

diff --git a/src/chrome/browser/chromeos/input_method/input_method_manager_impl.h b/src/chrome/browser/chromeos/input_method/input_method_manager_impl.h
index b3b2d68..889a3f2 100644 (file)
--- a/src/chrome/browser/chromeos/input_method/input_method_manager_impl.h
+++ b/src/chrome/browser/chromeos/input_method/input_method_manager_impl.h
@@ -59,9 +59,10 @@ class InputMethodManagerImpl : public InputMethodManager,
   virtual size_t GetNumActiveInputMethods() const OVERRIDE;
   virtual const InputMethodDescriptor* GetInputMethodFromId(
       const std::string& input_method_id) const OVERRIDE;
-  virtual void EnableLayouts(const std::string& language_code,
-                             const std::string& initial_layout) OVERRIDE;
-  virtual bool EnableInputMethods(
+  virtual void EnableLoginLayouts(
+      const std::string& language_code,
+      const std::vector<std::string>& initial_layouts) OVERRIDE;
+  virtual bool ReplaceEnabledInputMethods(
       const std::vector<std::string>& new_active_input_method_ids) OVERRIDE;
   virtual bool EnableInputMethod(const std::string& new_active_input_method_id)
       OVERRIDE;
@@ -74,7 +75,7 @@ class InputMethodManagerImpl : public InputMethodManager,
   virtual void GetInputMethodExtensions(
       InputMethodDescriptors* result) OVERRIDE;
   virtual void SetEnabledExtensionImes(std::vector<std::string>* ids) OVERRIDE;
-  virtual void SetInputMethodDefault() OVERRIDE;
+  virtual void SetInputMethodLoginDefault() OVERRIDE;
   virtual bool SwitchToNextInputMethod() OVERRIDE;
   virtual bool SwitchToPreviousInputMethod(
       const ui::Accelerator& accelerator) OVERRIDE;