Index: ui/keyboard/keyboard_controller.cc |
diff --git a/ui/keyboard/keyboard_controller.cc b/ui/keyboard/keyboard_controller.cc |
index 95966147d89644c492af6be9e47eb5131752115f..b216e0e7cab1112fbef340d7f6f4315319da0714 100644 |
--- a/ui/keyboard/keyboard_controller.cc |
+++ b/ui/keyboard/keyboard_controller.cc |
@@ -180,6 +180,9 @@ void CallbackAnimationObserver::OnLayerAnimationAborted( |
animator_->RemoveObserver(this); |
} |
+// static |
+KeyboardController* KeyboardController::instance_ = NULL; |
+ |
KeyboardController::KeyboardController(KeyboardControllerProxy* proxy) |
: proxy_(proxy), |
input_method_(NULL), |
@@ -199,6 +202,18 @@ KeyboardController::~KeyboardController() { |
input_method_->RemoveObserver(this); |
} |
+// static |
+void KeyboardController::ResetInstance(KeyboardController* controller) { |
+ if (instance_ && instance_ != controller) |
+ delete instance_; |
+ instance_ = controller; |
+} |
+ |
+// static |
+KeyboardController* KeyboardController::GetInstance() { |
+ return instance_; |
+} |
+ |
aura::Window* KeyboardController::GetContainerWindow() { |
if (!container_.get()) { |
container_.reset(new aura::Window( |