From 681c568bdde24a8d438b6bb8b1cca07fba87ed6f Mon Sep 17 00:00:00 2001 From: "dmazzoni@google.com" Date: Thu, 11 Apr 2013 16:44:31 +0000 Subject: Revert 193662 "Control visibility of the virtual keyboard." > Control visibility of the virtual keyboard. > > Add an observer to InputMethod. This makes the InputMethod the gatherer of text input state changes, which are then distributed to interested parties. > > The KeyboardController becomes an InputMethod::Observer, and shows/hides the keyboard as appropriate. > > BUG=227128 > > Review URL: https://chromiumcodereview.appspot.com/13207003 TBR=bryeung@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193666 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/root_window_controller.cc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'ash/root_window_controller.cc') diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index a975fa8..394922f 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -293,6 +293,8 @@ void RootWindowController::InitForPrimaryDisplay() { if (Shell::GetInstance()->delegate()->IsUserLoggedIn()) shelf_->CreateLauncher(); + // TODO(bryeung): Move this to CreateContainersInRootWindow when the + // keyboard controller will take care of deferring creation of the keyboard. InitKeyboard(); } @@ -511,6 +513,9 @@ void RootWindowController::InitKeyboard() { aura::Window* keyboard_container = keyboard_controller_->GetContainerWindow(); parent->AddChild(keyboard_container); + // TODO(bryeung): move this to the controller on visibility changed + parent->StackChildAtTop(keyboard_container); + keyboard_container->Show(); } } -- cgit v1.1