Index: ui/keyboard/keyboard_controller.cc |
diff --git a/ui/keyboard/keyboard_controller.cc b/ui/keyboard/keyboard_controller.cc |
index 83e7f321c5c77f8e389e3fea5c9232e5ce87a208..bebd27e66feee93a5c1327a3aa7a4150efe11c06 100644 |
--- a/ui/keyboard/keyboard_controller.cc |
+++ b/ui/keyboard/keyboard_controller.cc |
@@ -129,6 +129,11 @@ KeyboardController::KeyboardController(KeyboardControllerProxy* proxy) |
CHECK(proxy); |
input_method_ = proxy_->GetInputMethod(); |
input_method_->AddObserver(this); |
+ container_ = new aura::Window(new KeyboardWindowDelegate()); |
+ container_->SetName("KeyboardContainer"); |
+ container_->Init(ui::LAYER_NOT_DRAWN); |
+ container_->AddObserver(this); |
+ container_->SetLayoutManager(new KeyboardLayoutManager(container_)); |
sadrul
2013/10/03 15:26:28
Is this change necessary?
bshe
2013/10/03 15:57:13
dooh. noop. It was from one of my experimental ref
bshe
2013/10/04 00:58:08
Done.
|
} |
KeyboardController::~KeyboardController() { |
@@ -139,13 +144,6 @@ KeyboardController::~KeyboardController() { |
} |
aura::Window* KeyboardController::GetContainerWindow() { |
- if (!container_) { |
- container_ = new aura::Window(new KeyboardWindowDelegate()); |
- container_->SetName("KeyboardContainer"); |
- container_->Init(ui::LAYER_NOT_DRAWN); |
- container_->AddObserver(this); |
- container_->SetLayoutManager(new KeyboardLayoutManager(container_)); |
- } |
return container_; |
} |