diff options
| author | bryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-11 16:32:30 +0000 |
|---|---|---|
| committer | bryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-11 16:32:30 +0000 |
| commit | 6cdc546c281b910b38902812c183e9669ea4102e (patch) | |
| tree | 85e8765d9c0120a2d0dbe9cb502fdd4903d3bb44 /ash/root_window_controller.cc | |
| parent | d4b86678342e52743dfcf442088905a36bd603e0 (diff) | |
| download | chromium_src-6cdc546c281b910b38902812c183e9669ea4102e.zip chromium_src-6cdc546c281b910b38902812c183e9669ea4102e.tar.gz chromium_src-6cdc546c281b910b38902812c183e9669ea4102e.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
Review URL: https://chromiumcodereview.appspot.com/13207003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193662 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/root_window_controller.cc')
| -rw-r--r-- | ash/root_window_controller.cc | 5 |
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(); } } |