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

Unified Diff: ui/keyboard/keyboard_controller.cc

Issue 25111002: Only show virtual keyboard on primary root window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move KeyboardController to shell Created 7 years, 2 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
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_;
}
« ash/root_window_controller.cc ('K') | « chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698