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

Unified Diff: ash/shell.cc

Issue 613343005: Automatic deployment of the virtual keyboard. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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/virtual_keyboard_controller.h » ('j') | ash/virtual_keyboard_controller.h » ('J')
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 83b04067986b3dd9ba84124d50132d1ecef4a1d5..8ea3a134ca6fa7e1bc3bf1e995cd29265b3d743c 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -887,7 +887,6 @@ void Shell::Init(const ShellInitParams& init_params) {
display_controller_->Start();
display_controller_->CreatePrimaryHost(
ShellInitParamsToAshWindowTreeHostInitParams(init_params));
- virtual_keyboard_controller_.reset(new VirtualKeyboardController);
aura::Window* root_window = display_controller_->GetPrimaryRootWindow();
target_root_window_ = root_window;
@@ -1032,6 +1031,10 @@ void Shell::Init(const ShellInitParams& init_params) {
display_controller_->InitDisplays();
+ // Needs to be created after InitDisplays() since it may cause the virtual
+ // keyboard to be deployed.
+ virtual_keyboard_controller_.reset(new VirtualKeyboardController);
+
// It needs to be created after RootWindowController has been created
// (which calls OnWindowResized has been called, otherwise the
// widget will not paint when restoring after a browser crash. Also it needs
« no previous file with comments | « no previous file | ash/virtual_keyboard_controller.h » ('j') | ash/virtual_keyboard_controller.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698