Make keyboard controller a singleton.

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 4c12d322a5359dd7e30e1f257cfeeea142a2d0c2..22c20215d22b449d2cea3d47aafbf0ec997e8644 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -410,22 +410,22 @@ void Shell::CreateKeyboard() {
   InitKeyboard();
   if (keyboard::IsKeyboardUsabilityExperimentEnabled()) {
     display_controller()->virtual_keyboard_window_controller()->
-        ActivateKeyboard(keyboard_controller_.get());
+        ActivateKeyboard(keyboard::KeyboardController::GetInstance());
   } else {
     GetPrimaryRootWindowController()->
-        ActivateKeyboard(keyboard_controller_.get());
+        ActivateKeyboard(keyboard::KeyboardController::GetInstance());
   }
 }
 
 void Shell::DeactivateKeyboard() {
-  if (keyboard_controller_.get()) {
+  if (keyboard::KeyboardController::GetInstance()) {
     RootWindowControllerList controllers = GetAllRootWindowControllers();
     for (RootWindowControllerList::iterator iter = controllers.begin();
         iter != controllers.end(); ++iter) {
-      (*iter)->DeactivateKeyboard(keyboard_controller_.get());
+      (*iter)->DeactivateKeyboard(keyboard::KeyboardController::GetInstance());
     }
   }
-  keyboard_controller_.reset();
+  keyboard::KeyboardController::ResetInstance(NULL);
 }
 
 void Shell::ShowShelf() {
@@ -756,12 +756,12 @@ Shell::~Shell() {
   display_controller_->Shutdown();
   display_controller_.reset();
   screen_position_controller_.reset();
-
-  keyboard_controller_.reset();
   accessibility_delegate_.reset();
   new_window_delegate_.reset();
   media_delegate_.reset();
 
+  keyboard::KeyboardController::ResetInstance(NULL);
+
 #if defined(OS_CHROMEOS) && defined(USE_X11)
   if (display_change_observer_)
     output_configurator_->RemoveObserver(display_change_observer_.get());
@@ -1033,16 +1033,17 @@ void Shell::Init() {
 
 void Shell::InitKeyboard() {
   if (keyboard::IsKeyboardEnabled()) {
-    if (keyboard_controller_.get()) {
+    if (keyboard::KeyboardController::GetInstance()) {
       RootWindowControllerList controllers = GetAllRootWindowControllers();
       for (RootWindowControllerList::iterator iter = controllers.begin();
            iter != controllers.end(); ++iter) {
-        (*iter)->DeactivateKeyboard(keyboard_controller_.get());
+        (*iter)->DeactivateKeyboard(
+            keyboard::KeyboardController::GetInstance());
       }
     }
     keyboard::KeyboardControllerProxy* proxy =
         delegate_->CreateKeyboardControllerProxy();
-    keyboard_controller_.reset(
+    keyboard::KeyboardController::ResetInstance(
         new keyboard::KeyboardController(proxy));
   }
 }