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();
 
+  // Disable keyboard container before close child windows and shutdown

[varkha, 2013/10/04 01:54:07]

nit: s/close/closing, s/shutdown/shutting down.

[bshe, 2013/10/04 03:04:39]

Done.

+  // associated layout managers.
+  DisableKeyboard(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 92 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()) {
+void RootWindowController::EnableKeyboard(

[varkha, 2013/10/04 01:54:07]

If I understand it right, "enabled" in keyboard::IsKeyboardEnabled and
EnableKeyboard mean different things. Consider renaming these methods to
something like ActivateKeyboard / DeactivateKeyboard.

[bshe, 2013/10/04 03:04:39]

Done.

+    keyboard::KeyboardController* keyboard_controller) {
+  if (keyboard::IsKeyboardEnabled() &&
+      !GetContainer(kShellWindowId_VirtualKeyboardContainer)) {

[varkha, 2013/10/04 01:54:07]

Could reverse the condition and return early.

[bshe, 2013/10/04 03:04:39]

Done.

+    DCHECK(keyboard_controller);
+    keyboard_controller->AddObserver(shelf()->shelf_layout_manager());
+    keyboard_controller->AddObserver(panel_layout_manager_);

[varkha, 2013/10/04 01:54:07]

AddObserver(docked_layout_manager_)

[bshe, 2013/10/04 03:04:39]

Added in patchset 7 after rebase.

On 2013/10/04 01:54:07, varkha wrote:

     aura::Window* parent = root_window();
-
-    keyboard::KeyboardControllerProxy* proxy =
-        Shell::GetInstance()->delegate()->CreateKeyboardControllerProxy();
-    keyboard_controller_.reset(
-        new keyboard::KeyboardController(proxy));
-
-    keyboard_controller_->AddObserver(shelf()->shelf_layout_manager());
-    keyboard_controller_->AddObserver(panel_layout_manager_);
-
     aura::Window* keyboard_container =
-        keyboard_controller_->GetContainerWindow();
+        keyboard_controller->GetContainerWindow();
     keyboard_container->set_id(kShellWindowId_VirtualKeyboardContainer);
     parent->AddChild(keyboard_container);
     keyboard_container->SetBounds(parent->bounds());
   }
 }
 
+void RootWindowController::DisableKeyboard(
+    keyboard::KeyboardController* keyboard_controller) {
+  if (keyboard::IsKeyboardEnabled()) {

[varkha, 2013/10/04 01:54:07]

Favor early return.

[bshe, 2013/10/04 03:04:39]

Done.

+    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_);

[varkha, 2013/10/04 01:54:07]

RemoveObserver(docked_layout_manager_)

[bshe, 2013/10/04 03:04:39]

Removed in patchset 7 after rebase
On 2013/10/04 01:54:07, varkha wrote:

+    }
+  }
+}
+
 
 ////////////////////////////////////////////////////////////////////////////////
 // RootWindowController, private:
 
 void RootWindowController::InitLayoutManagers() {
   root_window_layout_ =
       new RootWindowLayoutManager(root_window_.get());
   root_window_->SetLayoutManager(root_window_layout_);
 
   aura::Window* default_container =
@@ skipping 253 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