summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authorbryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-12 18:08:35 +0000
committerbryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-12 18:08:35 +0000
commit96e76080d2d429aaad846dc6c44ca30267d52997 (patch)
tree476841cdf8d2206b24c1defdaadf07f1dd1eceab /ash
parentb140c1e73ff3aaaef2233d73ea60029c4d914f91 (diff)
downloadchromium_src-96e76080d2d429aaad846dc6c44ca30267d52997.zip
chromium_src-96e76080d2d429aaad846dc6c44ca30267d52997.tar.gz
chromium_src-96e76080d2d429aaad846dc6c44ca30267d52997.tar.bz2
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 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=193662 Review URL: https://codereview.chromium.org/13207003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193965 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r--ash/root_window_controller.cc5
1 files changed, 0 insertions, 5 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index 394922f..a975fa8 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -293,8 +293,6 @@ 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();
}
@@ -513,9 +511,6 @@ 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();
}
}