Only show virtual keyboard on primary root window

ash/root_window_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/root_window_controller.h"
 
 #include <queue>
 #include <vector>
 
 #include "ash/ash_constants.h"
@@ skipping 313 matching lines @@
 const aura::Window* RootWindowController::GetContainer(int container_id) const {
   return root_window_->GetChildById(container_id);
 }
 
 void RootWindowController::Init(bool first_run_after_boot) {
   root_window_->SetCursor(ui::kCursorPointer);
   CreateContainersInRootWindow(root_window_.get());
   CreateSystemBackground(first_run_after_boot);
 
   InitLayoutManagers();
-  InitKeyboard();
   InitTouchHuds();
 
   if (Shell::GetPrimaryRootWindowController()->
       GetSystemModalLayoutManager(NULL)->has_modal_background()) {
     GetSystemModalLayoutManager(NULL)->CreateModalBackground();
   }
 
   Shell::GetInstance()->AddShellObserver(this);
 }
 
@@ skipping 55 matching lines @@
     // before move it to |kDesktopController|.
     DCHECK_EQ(controller->widget(), widget);
     // Release the old controller and close its background widget.
     SetWallpaperController(controller);
   }
 }
 
 void RootWindowController::CloseChildWindows() {
   mouse_event_target_.reset();
 
+  // Deactivate keyboard container before closing child windows and shutting
+  // down associated layout managers.
+  DeactivateKeyboard(Shell::GetInstance()->keyboard_controller());
+
   if (!shelf_.get())
     return;
   // panel_layout_manager_ needs to be shut down before windows are destroyed.
   if (panel_layout_manager_) {
     panel_layout_manager_->Shutdown();
     panel_layout_manager_ = NULL;
   }
   // docked_layout_manager_ needs to be shut down before windows are destroyed.
   if (docked_layout_manager_) {
     if (shelf_->shelf_layout_manager())
@@ skipping 101 matching lines @@
   const aura::Window::Windows& windows =
       GetContainer(kShellWindowId_DefaultContainer)->children();
   for (aura::Window::Windows::const_reverse_iterator iter = windows.rbegin();
        iter != windows.rend(); ++iter) {
     if (wm::GetWindowState(*iter)->IsFullscreen())
       return *iter;
   }
   return NULL;
 }
 
-void RootWindowController::InitKeyboard() {
-  if (keyboard::IsKeyboardEnabled()) {
-    aura::Window* parent = root_window();
+void RootWindowController::ActivateKeyboard(
+    keyboard::KeyboardController* keyboard_controller) {
+  if (!keyboard::IsKeyboardEnabled() ||
+      GetContainer(kShellWindowId_VirtualKeyboardContainer)) {
+    return;
+  }
+  DCHECK(keyboard_controller);
+  keyboard_controller->AddObserver(shelf()->shelf_layout_manager());
+  keyboard_controller->AddObserver(panel_layout_manager_);
+  keyboard_controller->AddObserver(docked_layout_manager_);
+  aura::Window* parent = root_window();
+  aura::Window* keyboard_container =
+      keyboard_controller->GetContainerWindow();
+  keyboard_container->set_id(kShellWindowId_VirtualKeyboardContainer);
+  parent->AddChild(keyboard_container);
+  keyboard_container->SetBounds(parent->bounds());

[oshima, 2013/10/04 16:50:17]

won't RootWindowLayoutManager handle this?

[bshe, 2013/10/04 17:38:32]

Sorry, just to confirm, do you mean the SetBounds here is not necessary? In the
RootWindowLayoutManager, it seems OnWindowAddedToLayout didn't do anything (I
assume it is the place to SetBounds of child?). Or maybe we rely on
OnWindowResized to set the bounds?

On 2013/10/04 16:50:17, oshima wrote:

[oshima, 2013/10/04 17:51:35]

I see. Maybe it's doing this way to avoid some issue in resizing container when
not all containers are added. Can you add TODO(oshima): here to fix
RootWindowLayoutManager and remove this?

[bshe, 2013/10/04 18:05:52]

Thanks! Added a TODO.

On 2013/10/04 17:51:35, oshima wrote:

+}
 
-    keyboard::KeyboardControllerProxy* proxy =
-        Shell::GetInstance()->delegate()->CreateKeyboardControllerProxy();
-    keyboard_controller_.reset(
-        new keyboard::KeyboardController(proxy));
+void RootWindowController::DeactivateKeyboard(
+    keyboard::KeyboardController* keyboard_controller) {
+  if (!keyboard::IsKeyboardEnabled())
+    return;
 
-    keyboard_controller_->AddObserver(shelf()->shelf_layout_manager());
-    keyboard_controller_->AddObserver(panel_layout_manager_);
-    keyboard_controller_->AddObserver(docked_layout_manager_);
-
-    // Deletes the old container since |keyboard_controller_| creates a
-    // new container window in GetContainerWindow().
-    delete GetContainer(kShellWindowId_VirtualKeyboardContainer);
-
-    aura::Window* keyboard_container =
-        keyboard_controller_->GetContainerWindow();
-    keyboard_container->set_id(kShellWindowId_VirtualKeyboardContainer);
-    parent->AddChild(keyboard_container);
-    keyboard_container->SetBounds(parent->bounds());
+  DCHECK(keyboard_controller);
+  aura::Window* keyboard_container =
+      keyboard_controller->GetContainerWindow();
+  if (keyboard_container->GetRootWindow() == root_window()) {
+    root_window()->RemoveChild(keyboard_container);
+    keyboard_controller->RemoveObserver(shelf()->shelf_layout_manager());
+    keyboard_controller->RemoveObserver(panel_layout_manager_);
+    keyboard_controller->RemoveObserver(docked_layout_manager_);
   }
 }
 
 
 ////////////////////////////////////////////////////////////////////////////////
 // RootWindowController, private:
 
 void RootWindowController::InitLayoutManagers() {
   root_window_layout_ =
       new RootWindowLayoutManager(root_window_.get());
@@ skipping 257 matching lines @@
   set_touch_hud_projection(new TouchHudProjection(root_window_.get()));
 }
 
 void RootWindowController::DisableTouchHudProjection() {
   if (!touch_hud_projection_)
     return;
   touch_hud_projection_->Remove();
 }
 
 void RootWindowController::OnLoginStateChanged(user::LoginStatus status) {
-  if (status != user::LOGGED_IN_NONE)
-    InitKeyboard();
   shelf_->shelf_layout_manager()->UpdateVisibilityState();
 }
 
 void RootWindowController::OnTouchHudProjectionToggled(bool enabled) {
   if (enabled)
     EnableTouchHudProjection();
   else
     DisableTouchHudProjection();
 }
 
 RootWindowController* GetRootWindowController(
     const aura::RootWindow* root_window) {
   return root_window ? GetRootWindowSettings(root_window)->controller : NULL;
 }
 
 }  // namespace internal
 }  // namespace ash