Add a full screen virtual keyboard to virtual keyboard 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 382 matching lines @@
   }
 }
 
 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_ && docked_layout_manager_) {
     if (shelf_->shelf_layout_manager())
       docked_layout_manager_->RemoveObserver(shelf_->shelf_layout_manager());
     docked_layout_manager_->Shutdown();
     docked_layout_manager_ = NULL;
   }
 
   aura::client::SetDragDropClient(root_window_.get(), NULL);
 
   // TODO(harrym): Remove when Status Area Widget is a child view.
-  shelf_->ShutdownStatusAreaWidget();
+  if (shelf_) {
+    shelf_->ShutdownStatusAreaWidget();
 
-  if (shelf_->shelf_layout_manager())
-    shelf_->shelf_layout_manager()->PrepareForShutdown();
+    if (shelf_->shelf_layout_manager())
+      shelf_->shelf_layout_manager()->PrepareForShutdown();
+  }

[oshima, 2013/11/01 00:09:02]

can you rebase?

[bshe, 2013/11/12 15:28:33]

Done.

 
   // Close background widget first as it depends on tooltip.
   wallpaper_controller_.reset();
   animating_wallpaper_controller_.reset();
 
   workspace_controller_.reset();
   aura::client::SetTooltipClient(root_window_.get(), NULL);
 
   // Explicitly destroy top level windows. We do this as during part of
   // destruction such windows may query the RootWindow for state.
@@ skipping 86 matching lines @@
   return NULL;
 }
 
 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_);
+  if (!keyboard::IsKeyboardUsabilityTestEnabled()) {
+    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);
   // TODO(oshima): Bounds of keyboard container should be handled by
   // RootWindowLayoutManager. Remove this after fixed RootWindowLayoutManager.
   keyboard_container->SetBounds(parent->bounds());
 }
 
 void RootWindowController::DeactivateKeyboard(
     keyboard::KeyboardController* keyboard_controller) {
   if (!keyboard::IsKeyboardEnabled())
     return;
 
   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_);
+    if (!keyboard::IsKeyboardUsabilityTestEnabled()) {
+      keyboard_controller->RemoveObserver(shelf()->shelf_layout_manager());
+      keyboard_controller->RemoveObserver(panel_layout_manager_);
+      keyboard_controller->RemoveObserver(docked_layout_manager_);
+    }
   }
 }
 
 
 ////////////////////////////////////////////////////////////////////////////////
 // RootWindowController, private:
 
 RootWindowController::RootWindowController(aura::RootWindow* root_window)
     : root_window_(root_window),
       root_window_layout_(NULL),
       docked_layout_manager_(NULL),
       panel_layout_manager_(NULL),
       touch_hud_debug_(NULL),
       touch_hud_projection_(NULL) {
   GetRootWindowSettings(root_window)->controller = this;
   screen_dimmer_.reset(new ScreenDimmer(root_window));
 
   stacking_controller_.reset(new StackingController);
   aura::client::SetWindowTreeClient(root_window, stacking_controller_.get());
   capture_client_.reset(new views::corewm::ScopedCaptureClient(root_window));
 }
 
 void RootWindowController::Init(RootWindowType root_window_type,
                                 bool first_run_after_boot) {
-  Shell::GetInstance()->InitRootWindow(root_window_.get());
+  Shell* shell = Shell::GetInstance();
+  shell->InitRootWindow(root_window_.get());
 
   root_window_->SetCursor(ui::kCursorPointer);
   CreateContainersInRootWindow(root_window_.get());
 
-  if (root_window_type == VIRTUAL_KEYBOARD)
+  if (root_window_type == VIRTUAL_KEYBOARD) {
+    shell->InitKeyboard(this);
     return;
+  }
 
   CreateSystemBackground(first_run_after_boot);
 
   InitLayoutManagers();
   InitTouchHuds();
 
   if (Shell::GetPrimaryRootWindowController()->
       GetSystemModalLayoutManager(NULL)->has_modal_background()) {
     GetSystemModalLayoutManager(NULL)->CreateModalBackground();
   }
 
-  Shell* shell = Shell::GetInstance();
   shell->AddShellObserver(this);
 
   if (root_window_type == PRIMARY) {
     root_window_layout()->OnWindowResized();
-    shell->InitKeyboard(this);
+    if (!keyboard::IsKeyboardUsabilityTestEnabled())

[oshima, 2013/11/01 00:09:02]

The name of this flag is confusing. Can we rename to something like
KeyboardDisplayTestEnabled() ?

[bshe, 2013/11/12 15:28:33]

Do you mean change --keyboard-usability-test to --keyboard-display-test and the
corresponding function name? It looks like the usability test flag has been used
from the beginning. It is a bit confusing in this case but it seems better
describe our purpose. I can definitely do the change if you are strong on the
name change.

On 2013/11/01 00:09:02, oshima wrote:

+      shell->InitKeyboard(this);
   } else {
     root_window_layout()->OnWindowResized();
     shell->desktop_background_controller()->OnRootWindowAdded(
         root_window_.get());
     shell->high_contrast_controller()->OnRootWindowAdded(root_window_.get());
     root_window_->ShowRootWindow();
     // Activate new root for testing.
     // TODO(oshima): remove this.
     shell->set_target_root_window(root_window_.get());
 
@@ skipping 292 matching lines @@
     DisableTouchHudProjection();
 }
 
 RootWindowController* GetRootWindowController(
     const aura::Window* root_window) {
   return root_window ? GetRootWindowSettings(root_window)->controller : NULL;
 }
 
 }  // namespace internal
 }  // namespace ash