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

trunk/src/chromeos/ime/input_method_manager.h

Index: trunk/src/chromeos/ime/input_method_manager.h
===================================================================
--- trunk/src/chromeos/ime/input_method_manager.h	(revision 251193)
+++ trunk/src/chromeos/ime/input_method_manager.h	(working copy)
@@ -12,6 +12,7 @@
 #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;
@@ -43,6 +44,8 @@
     // 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
@@ -123,7 +126,7 @@
                                   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.
@@ -156,6 +159,13 @@
   // 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;