Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(196)

Unified Diff: ui/keyboard/keyboard_controller.h

Issue 14477010: Partial fix for keyboard occlusion. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: gyp fix Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/keyboard/keyboard.gyp ('k') | ui/keyboard/keyboard_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
};
« no previous file with comments | « ui/keyboard/keyboard.gyp ('k') | ui/keyboard/keyboard_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698