Add a full screen virtual keyboard to virtual keyboard root window

ash/root_window_controller.cc

Index: ash/root_window_controller.cc
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index 072608c6874ed88291b9dc5b2b334f0f05926b94..c2e5b38057dd577e0ca947a1d9bd0cf0d37d9581 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -272,6 +272,10 @@ void RootWindowController::SetAnimatingWallpaperController(
 }
 
 void RootWindowController::Shutdown() {
+  if (root_window_type_ == VIRTUAL_KEYBOARD) {
+    return;
+  }

[oshima, 2013/10/30 21:05:30]

ditto

[bshe, 2013/10/31 16:45:44]

Done.

+
   Shell::GetInstance()->RemoveShellObserver(this);
 
   if (animating_wallpaper_controller_.get())
@@ -528,9 +532,11 @@ void RootWindowController::ActivateKeyboard(
     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();
@@ -551,9 +557,11 @@ void RootWindowController::DeactivateKeyboard(
       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_);
+    }
   }
 }
 
@@ -578,13 +586,17 @@ RootWindowController::RootWindowController(aura::RootWindow* root_window)
 
 void RootWindowController::Init(RootWindowType root_window_type,
                                 bool first_run_after_boot) {
-  Shell::GetInstance()->InitRootWindow(root_window_.get());
+  Shell* shell = Shell::GetInstance();
+  root_window_type_ = root_window_type;
+  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);
 
@@ -596,12 +608,13 @@ void RootWindowController::Init(RootWindowType root_window_type,
     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()) {
+      shell->InitKeyboard(this);
+    }

[oshima, 2013/10/30 21:05:30]

nuke {}

[bshe, 2013/10/31 16:45:44]

Done.

   } else {
     root_window_layout()->OnWindowResized();
     shell->desktop_background_controller()->OnRootWindowAdded(