| Index: ui/keyboard/keyboard_controller.h
|
| diff --git a/ui/keyboard/keyboard_controller.h b/ui/keyboard/keyboard_controller.h
|
| index ca7d0ada03ee37eccecc99ebc2fa492b1507349b..cb21b1d6c7c20ae8f57725f37d6352d05f379d61 100644
|
| --- a/ui/keyboard/keyboard_controller.h
|
| +++ b/ui/keyboard/keyboard_controller.h
|
| @@ -7,6 +7,7 @@
|
|
|
| #include "base/basictypes.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "base/observer_list.h"
|
| #include "ui/aura/window_observer.h"
|
| #include "ui/base/ime/input_method_observer.h"
|
| #include "ui/keyboard/keyboard_export.h"
|
| @@ -14,7 +15,9 @@
|
| namespace aura {
|
| class Window;
|
| }
|
| -
|
| +namespace gfx {
|
| +class Rect;
|
| +}
|
| namespace ui {
|
| class InputMethod;
|
| class TextInputClient;
|
| @@ -22,6 +25,7 @@ class TextInputClient;
|
|
|
| namespace keyboard {
|
|
|
| +class KeyboardControllerObserver;
|
| class KeyboardControllerProxy;
|
| class KeyboardLayoutManager;
|
|
|
| @@ -38,6 +42,10 @@ class KEYBOARD_EXPORT KeyboardController : public ui::InputMethodObserver,
|
| // It is the responsibility of the caller to Show() the returned window.
|
| aura::Window* GetContainerWindow();
|
|
|
| + // Management of the observer list.
|
| + virtual void AddObserver(KeyboardControllerObserver* observer);
|
| + virtual void RemoveObserver(KeyboardControllerObserver* observer);
|
| +
|
| private:
|
| // For access to Observer methods for simulation.
|
| friend class KeyboardControllerTest;
|
| @@ -57,6 +65,8 @@ class KEYBOARD_EXPORT KeyboardController : public ui::InputMethodObserver,
|
| aura::Window* container_;
|
| ui::InputMethod* input_method_;
|
|
|
| + ObserverList<KeyboardControllerObserver> observer_list_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(KeyboardController);
|
| };
|
|
|
|
|