Revert 251164 "Split out InputMethodMenuManager from InputMethod..."

trunk/src/chromeos/ime/input_method_manager.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROMEOS_IME_INPUT_METHOD_MANAGER_H_
 #define CHROMEOS_IME_INPUT_METHOD_MANAGER_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "chromeos/chromeos_export.h"
 #include "chromeos/ime/input_method_descriptor.h"
+#include "chromeos/ime/input_method_property.h"
 
 namespace ui {
 class Accelerator;
 }  // namespace ui
 
 namespace chromeos {
 class ComponentExtensionIMEManager;
 class InputMethodEngineInterface;
 namespace input_method {
 class InputMethodUtil;
@@ skipping 11 matching lines @@
     STATE_TERMINATING,
   };
 
   class Observer {
    public:
     virtual ~Observer() {}
     // Called when the current input method is changed.  |show_message|
     // indicates whether the user should be notified of this change.
     virtual void InputMethodChanged(InputMethodManager* manager,
                                     bool show_message) = 0;
+    // Called when the list of properties is changed.
+    virtual void InputMethodPropertyChanged(InputMethodManager* manager) = 0;
   };
 
   // CandidateWindowObserver is notified of events related to the candidate
   // window.  The "suggestion window" used by IMEs such as ibus-mozc does not
   // count as the candidate window (this may change if we later want suggestion
   // window events as well).  These events also won't occur when the virtual
   // keyboard is used, since it controls its own candidate window.
   class CandidateWindowObserver {
    public:
     virtual ~CandidateWindowObserver() {}
@@ skipping 60 matching lines @@
   // |initial_layout| if the string is not empty. For example, if
   // |language_code| is "en-US", US Qwerty, US International, US Extended, US
   // Dvorak, and US Colemak layouts would be enabled. Likewise, for Germany
   // locale, US Qwerty which corresponds to the hardware keyboard layout and
   // several keyboard layouts for Germany would be enabled.
   //   Only layouts suitable for login screen are enabled.
   virtual void EnableLoginLayouts(const std::string& language_code,
                                   const std::string& initial_layout) = 0;
 
   // Activates the input method property specified by the |key|.
-  virtual void ActivateInputMethodMenuItem(const std::string& key) = 0;
+  virtual void ActivateInputMethodProperty(const std::string& key) = 0;
 
   // Updates the list of active input method IDs, and then starts or stops the
   // system input method framework as needed.
   virtual bool EnableInputMethods(
       const std::vector<std::string>& new_active_input_method_ids) = 0;
 
   // Adds one entry to the list of active input method IDs, and then starts or
   // stops the system input method framework as needed.
   virtual bool EnableInputMethod(
       const std::string& new_active_input_method_id) = 0;
@@ skipping 12 matching lines @@
 
   // Sets the list of extension IME ids which should be enabled.
   virtual void SetEnabledExtensionImes(std::vector<std::string>* ids) = 0;
 
   // Sets current input method to default (first owners, then hardware).
   virtual void SetInputMethodDefault() = 0;
 
   // Gets the descriptor of the input method which is currently selected.
   virtual InputMethodDescriptor GetCurrentInputMethod() const = 0;
 
+  // Gets the list of input method properties. The list could be empty().
+  virtual InputMethodPropertyList GetCurrentInputMethodProperties() const = 0;
+
+  // Sets the list of input method properties. The list could be empty().
+  virtual void SetCurrentInputMethodProperties(
+      const InputMethodPropertyList& property_list) = 0;
+
   // Returns an X keyboard object which could be used to change the current XKB
   // layout, change the caps lock status, and set the auto repeat rate/interval.
   virtual XKeyboard* GetXKeyboard() = 0;
 
   // Returns an InputMethodUtil object.
   virtual InputMethodUtil* GetInputMethodUtil() = 0;
 
   // Returns a ComponentExtentionIMEManager object.
   virtual ComponentExtensionIMEManager* GetComponentExtensionIMEManager() = 0;
 
   // Switches the current input method (or keyboard layout) to the next one.
   virtual bool SwitchToNextInputMethod() = 0;
 
   // Switches the current input method (or keyboard layout) to the previous one.
   virtual bool SwitchToPreviousInputMethod(
       const ui::Accelerator& accelerator) = 0;
 
   // Switches to an input method (or keyboard layout) which is associated with
   // the |accelerator|.
   virtual bool SwitchInputMethod(const ui::Accelerator& accelerator) = 0;
 
   // If keyboard layout can be uset at login screen
   virtual bool IsLoginKeyboard(const std::string& layout) const = 0;
 };
 
 }  // namespace input_method
 }  // namespace chromeos
 
 #endif  // CHROMEOS_IME_INPUT_METHOD_MANAGER_H_