Index: ash/root_window_controller.cc |
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc |
index 991f1eb2127d6ced2657b9058acbffc9d6083d42..d8162c7def9f518c5fbe19d51ce1e7faeca6de2d 100644 |
--- a/ash/root_window_controller.cc |
+++ b/ash/root_window_controller.cc |
@@ -477,8 +477,13 @@ void RootWindowController::InitKeyboard() { |
Shell::GetInstance()->delegate()->CreateKeyboardControllerProxy(); |
keyboard_controller_.reset( |
new keyboard::KeyboardController(proxy)); |
+ |
+ keyboard_controller_->AddObserver(shelf()->shelf_layout_manager()); |
+ keyboard_controller_->AddObserver(panel_layout_manager_); |
+ |
aura::Window* keyboard_container = |
keyboard_controller_->GetContainerWindow(); |
+ |
parent->AddChild(keyboard_container); |
keyboard_container->SetBounds(parent->bounds()); |
} |