Make keyboard controller a singleton.

ash/shell.h

Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 1f511db436fbf81cfc344bdddd8e7017b4dad195..3de6053f02b23b25f7534f974226607003115ea3 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -47,10 +47,6 @@ class Point;
 class Rect;
 }
 
-namespace keyboard {
-class KeyboardController;
-}
-
 namespace ui {
 class Layer;
 class OutputConfigurator;
@@ -329,10 +325,6 @@ class ASH_EXPORT Shell
   // Test if the MaximizeModeWindowManager is enabled or not.
   bool IsMaximizeModeWindowManagerEnabled();
 
-  keyboard::KeyboardController* keyboard_controller() {
-    return keyboard_controller_.get();
-  }
-
   AcceleratorController* accelerator_controller() {
     return accelerator_controller_.get();
   }
@@ -619,7 +611,6 @@ class ASH_EXPORT Shell
   std::vector<WindowAndBoundsPair> to_restore_;
 
   scoped_ptr<UserMetricsRecorder> user_metrics_recorder_;
-  scoped_ptr<keyboard::KeyboardController> keyboard_controller_;
   scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_;
   scoped_ptr<AcceleratorController> accelerator_controller_;
   scoped_ptr<ShellDelegate> delegate_;