| Index: chrome/browser/chromeos/input_method/input_method_manager_impl.h
|
| diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.h b/chrome/browser/chromeos/input_method/input_method_manager_impl.h
|
| index 7014ef7425e48789e010e0b59b69e8d7332e6353..49f4ddeab08b483ffe17ee813ef6a835a9db4ad0 100644
|
| --- a/chrome/browser/chromeos/input_method/input_method_manager_impl.h
|
| +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.h
|
| @@ -22,12 +22,14 @@
|
| namespace chromeos {
|
| class InputMethodEngineIBus;
|
| namespace input_method {
|
| +class InputMethodDelegate;
|
|
|
| // The implementation of InputMethodManager.
|
| class InputMethodManagerImpl : public InputMethodManager,
|
| public CandidateWindowController::Observer,
|
| public IBusController::Observer {
|
| public:
|
| + explicit InputMethodManagerImpl(scoped_ptr<InputMethodDelegate> delegate);
|
| virtual ~InputMethodManagerImpl();
|
|
|
| // InputMethodManager override:
|
| @@ -80,14 +82,8 @@ class InputMethodManagerImpl : public InputMethodManager,
|
| // Sets |xkeyboard_|.
|
| void SetXKeyboardForTesting(XKeyboard* xkeyboard);
|
|
|
| - // Creates a new instance of this class. The caller has to delete the returned
|
| - // object. The caller also have to set a mock CandidateWindowController,
|
| - // IBusController, and XKeyboard. See the setters above.
|
| - static InputMethodManagerImpl* GetInstanceForTesting();
|
| -
|
| private:
|
| friend class InputMethodManager;
|
| - InputMethodManagerImpl();
|
|
|
| // IBusController overrides:
|
| virtual void PropertyChanged() OVERRIDE;
|
| @@ -135,6 +131,8 @@ class InputMethodManagerImpl : public InputMethodManager,
|
| void ChangeInputMethodInternal(const std::string& input_method_id,
|
| bool show_message);
|
|
|
| + scoped_ptr<InputMethodDelegate> delegate_;
|
| +
|
| // The current browser status.
|
| State state_;
|
|
|
|
|