summaryrefslogtreecommitdiffstats
path: root/ash/root_window_controller.cc
diff options
context:
space:
mode:
authorbryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-17 12:32:51 +0000
committerbryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-17 12:32:51 +0000
commite0f71136250261a6bb464dd56edbe549dbd9fa5a (patch)
treee67ed33152ac2df76e7a6711393afd03f9f1d508 /ash/root_window_controller.cc
parenta8126e8c6c7b5e8fbed2c7c161a567dc81a93a92 (diff)
downloadchromium_src-e0f71136250261a6bb464dd56edbe549dbd9fa5a.zip
chromium_src-e0f71136250261a6bb464dd56edbe549dbd9fa5a.tar.gz
chromium_src-e0f71136250261a6bb464dd56edbe549dbd9fa5a.tar.bz2
Delayed loading of the virtual keyboard.
Don't create the virtual keyboard until it is first shown. This helps prevent some start-up races. Also clean-up some of the object ownership between KeyboardController and KeyboardLayoutManager. Each pointer exists in only one or the other object now. BUG=none Review URL: https://codereview.chromium.org/13932030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194580 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/root_window_controller.cc')
-rw-r--r--ash/root_window_controller.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index 6cefecc..6a8e815 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -512,6 +512,7 @@ void RootWindowController::InitKeyboard() {
aura::Window* keyboard_container =
keyboard_controller_->GetContainerWindow();
parent->AddChild(keyboard_container);
+ keyboard_container->SetBounds(parent->bounds());
}
}