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

Unified Diff: ash/root_window_controller.cc

Issue 14477010: Partial fix for keyboard occlusion. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « no previous file | ash/shelf/shelf_layout_manager.h » ('j') | ash/shelf/shelf_layout_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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());
}
« no previous file with comments | « no previous file | ash/shelf/shelf_layout_manager.h » ('j') | ash/shelf/shelf_layout_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698