Create and show the virtual keyboard.

Introduces ui/keyboard/ which contains generic code for the control of the keyboard (right now, just creation of the container window).

Also includes the necessary changes to ash so that the keyboard is (always) displayed on ChromeOS builds when the --enable-virtual-keyboard flag is present.

BUG=226986

Review URL: https://codereview.chromium.org/13164002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193378 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 0 deletions

diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
index ea3f316..1bd6ae8 100644
--- a/ash/root_window_controller.h
+++ b/ash/root_window_controller.h
@@ -30,6 +30,10 @@ class RootWindowEventFilter;
 }
 }
 
+namespace keyboard {
+class KeyboardController;
+}
+
 namespace ash {
 class StackingController;
 class ShelfWidget;
@@ -174,11 +178,16 @@ class ASH_EXPORT RootWindowController {
   // types in the shell UI.
   void CreateContainersInRootWindow(aura::RootWindow* root_window);
 
+  // Initializes the virtual keyboard.
+  void InitKeyboard();
+
   scoped_ptr<aura::RootWindow> root_window_;
   RootWindowLayoutManager* root_window_layout_;
 
   scoped_ptr<StackingController> stacking_controller_;
 
+  scoped_ptr<keyboard::KeyboardController> keyboard_controller_;
+
   // The shelf for managing the launcher and the status widget.
   scoped_ptr<ShelfWidget> shelf_;