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

trunk/src/chrome/browser/chromeos/input_method/input_method_manager_impl.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 CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_MANAGER_IMPL_H_
 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_MANAGER_IMPL_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 48 matching lines @@
   virtual size_t GetNumActiveInputMethods() const OVERRIDE;
   virtual const InputMethodDescriptor* GetInputMethodFromId(
       const std::string& input_method_id) const OVERRIDE;
   virtual void EnableLoginLayouts(const std::string& language_code,
                                   const std::string& initial_layout) OVERRIDE;
   virtual bool EnableInputMethods(
       const std::vector<std::string>& new_active_input_method_ids) OVERRIDE;
   virtual bool EnableInputMethod(const std::string& new_active_input_method_id)
       OVERRIDE;
   virtual void ChangeInputMethod(const std::string& input_method_id) OVERRIDE;
-  virtual void ActivateInputMethodMenuItem(const std::string& key) OVERRIDE;
+  virtual void ActivateInputMethodProperty(const std::string& key) OVERRIDE;
   virtual void AddInputMethodExtension(
       const std::string& id,
       InputMethodEngineInterface* instance) OVERRIDE;
   virtual void RemoveInputMethodExtension(const std::string& id) OVERRIDE;
   virtual void GetInputMethodExtensions(
       InputMethodDescriptors* result) OVERRIDE;
   virtual void SetEnabledExtensionImes(std::vector<std::string>* ids) OVERRIDE;
   virtual void SetInputMethodDefault() OVERRIDE;
   virtual bool SwitchToNextInputMethod() OVERRIDE;
   virtual bool SwitchToPreviousInputMethod(
       const ui::Accelerator& accelerator) OVERRIDE;
   virtual bool SwitchInputMethod(const ui::Accelerator& accelerator) OVERRIDE;
   virtual InputMethodDescriptor GetCurrentInputMethod() const OVERRIDE;
+  virtual InputMethodPropertyList
+      GetCurrentInputMethodProperties() const OVERRIDE;
+  virtual void SetCurrentInputMethodProperties(
+      const InputMethodPropertyList& property_list) OVERRIDE;
 
   virtual XKeyboard* GetXKeyboard() OVERRIDE;
   virtual InputMethodUtil* GetInputMethodUtil() OVERRIDE;
   virtual ComponentExtensionIMEManager*
       GetComponentExtensionIMEManager() OVERRIDE;
   virtual bool IsLoginKeyboard(const std::string& layout) const OVERRIDE;
 
   // Sets |candidate_window_controller_|.
   void SetCandidateWindowControllerForTesting(
       CandidateWindowController* candidate_window_controller);
   // Sets |xkeyboard_|.
   void SetXKeyboardForTesting(XKeyboard* xkeyboard);
   // Initialize |component_extension_manager_|.
   void InitializeComponentExtensionForTesting(
       scoped_ptr<ComponentExtensionIMEManagerDelegate> delegate);
 
  private:
+  // Notifies observers that the property list is updated.
+  void PropertyChanged();
+
   // CandidateWindowController::Observer overrides:
   virtual void CandidateClicked(int index) OVERRIDE;
   virtual void CandidateWindowOpened() OVERRIDE;
   virtual void CandidateWindowClosed() OVERRIDE;
 
   // Temporarily deactivates all input methods (e.g. Chinese, Japanese, Arabic)
   // since they are not necessary to input a login password. Users are still
   // able to use/switch active keyboard layouts (e.g. US qwerty, US dvorak,
   // French).
   void OnScreenLocked();
@@ skipping 65 matching lines @@
   // |current_input_method_|, and |active_input_method_ids_| above are copied
   // to these "saved" variables.
   InputMethodDescriptor saved_previous_input_method_;
   InputMethodDescriptor saved_current_input_method_;
   std::vector<std::string> saved_active_input_method_ids_;
 
   // Extra input methods that have been explicitly added to the menu, such as
   // those created by extension.
   std::map<std::string, InputMethodDescriptor> extra_input_methods_;
 
+  // Property list of the input method.  This is set by extension IMEs.
+  InputMethodPropertyList property_list_;
+
   // The candidate window.  This will be deleted when the APP_TERMINATING
   // message is sent.
   scoped_ptr<CandidateWindowController> candidate_window_controller_;
 
   // The object which can create an InputMethodDescriptor object.
   InputMethodWhitelist whitelist_;
 
   // An object which provides miscellaneous input method utility functions. Note
   // that |util_| is required to initialize |xkeyboard_|.
   InputMethodUtil util_;
@@ skipping 11 matching lines @@
 
   base::WeakPtrFactory<InputMethodManagerImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(InputMethodManagerImpl);
 };
 
 }  // namespace input_method
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_MANAGER_IMPL_H_