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

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: gyp fix 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') | no next file with comments »
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 e4472e0de8a860641efc12aa20939692ab2bbd04..3dbc7a918b49402d3eb8565fb3a8d3795ec81a4f 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -463,6 +463,10 @@ 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);
« no previous file with comments | « no previous file | ash/shelf/shelf_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698