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

Unified Diff: ash/shell.cc

Issue 2445293002: Make the virtual keyboard show up on the display with input focus. (Closed)
Patch Set: rebase & update 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
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 201c55f9918ac7cb657a633940d185d31abe21fa..311c95343847bbbf7db2b7516ed7136a52752971 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());
@@ -844,9 +842,17 @@ void Shell::InitKeyboard() {
keyboard::KeyboardController::GetInstance());
}
}
+#if defined(OS_CHROMEOS)
oshima 2016/11/08 17:26:05 do you need this? (ash is technically chromeos)
yhanada 2016/11/14 22:48:47 Yes, because the definition of |virtual_keyboard_c
+ 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
}
}

Powered by Google App Engine
This is Rietveld 408576698