Make the virtual keyboard show up on the display with input focus.

ash/shell.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/shell.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
@@ skipping 295 matching lines @@
     observer.OnCastingSessionStartedOrStopped(started);
 #endif
 }
 
 void Shell::OnRootWindowAdded(WmWindow* root_window) {
   for (auto& observer : *wm_shell_->shell_observers())
     observer.OnRootWindowAdded(root_window);
 }
 
 void Shell::CreateKeyboard() {
-  // TODO(bshe): Primary root window controller may not be the controller to
-  // attach virtual keyboard. See http://crbug.com/303429
   InitKeyboard();
   GetPrimaryRootWindowController()->ActivateKeyboard(
       keyboard::KeyboardController::GetInstance());
 }
 
 void Shell::DeactivateKeyboard() {
   // TODO(jamescook): Move keyboard create and hide into WmShell.
   wm_shell_->keyboard_ui()->Hide();
   if (keyboard::KeyboardController::GetInstance()) {
     RootWindowControllerList controllers = GetAllRootWindowControllers();
@@ skipping 510 matching lines @@
 void Shell::InitKeyboard() {
   if (keyboard::IsKeyboardEnabled()) {
     if (keyboard::KeyboardController::GetInstance()) {
       RootWindowControllerList controllers = GetAllRootWindowControllers();
       for (RootWindowControllerList::iterator iter = controllers.begin();
            iter != controllers.end(); ++iter) {
         (*iter)->DeactivateKeyboard(
             keyboard::KeyboardController::GetInstance());
       }
     }
+#if defined(OS_CHROMEOS)
     keyboard::KeyboardController::ResetInstance(
         new keyboard::KeyboardController(
-            wm_shell_->delegate()->CreateKeyboardUI()));
+            wm_shell_->delegate()->CreateKeyboardUI(),
+            virtual_keyboard_controller_.get()));
+#else
+    keyboard::KeyboardController::ResetInstance(
+        new keyboard::KeyboardController(
+            wm_shell_->delegate()->CreateKeyboardUI(), nullptr));
+
+#endif
   }
 }
 
 void Shell::InitRootWindow(aura::Window* root_window) {
   DCHECK(activation_client_);
   DCHECK(visibility_controller_.get());
   DCHECK(drag_drop_controller_.get());
 
   aura::client::SetFocusClient(root_window, focus_client_.get());
   aura::client::SetActivationClient(root_window, activation_client_);
@@ skipping 37 matching lines @@
 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const {
   return std::unique_ptr<ui::EventTargetIterator>();
 }
 
 ui::EventTargeter* Shell::GetEventTargeter() {
   NOTREACHED();
   return nullptr;
 }
 
 }  // namespace ash