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

Unified Diff: ash/shell.cc

Issue 2445293002: Make the virtual keyboard show up on the display with input focus. (Closed)
Patch Set: fix one more compilation error on Windows Created 4 years, 1 month 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 | « ash/root_window_controller_unittest.cc ('k') | ash/virtual_keyboard_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index a539468c0ab2943eb1531efa247ec3966d96e870..626c56fb9a79164686fc7cf4f15b67871f4b6639 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -313,8 +313,6 @@ void Shell::OnRootWindowAdded(WmWindow* root_window) {
}
void Shell::CreateKeyboard() {
- // TODO(bshe): Primary root window controller may not be the controller to
- // attach virtual keyboard. See http://crbug.com/303429
InitKeyboard();
GetPrimaryRootWindowController()->ActivateKeyboard(
keyboard::KeyboardController::GetInstance());
@@ -845,9 +843,17 @@ void Shell::InitKeyboard() {
keyboard::KeyboardController::GetInstance());
}
}
+#if defined(OS_CHROMEOS)
+ keyboard::KeyboardController::ResetInstance(
+ new keyboard::KeyboardController(
+ wm_shell_->delegate()->CreateKeyboardUI(),
+ virtual_keyboard_controller_.get()));
+#else
keyboard::KeyboardController::ResetInstance(
new keyboard::KeyboardController(
- wm_shell_->delegate()->CreateKeyboardUI()));
+ wm_shell_->delegate()->CreateKeyboardUI(), nullptr));
+
+#endif
}
}
« no previous file with comments | « ash/root_window_controller_unittest.cc ('k') | ash/virtual_keyboard_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698