Make keyboard controller a singleton.

chrome/browser/chromeos/input_method/input_method_engine.cc

 // Copyright 2013 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 "chrome/browser/chromeos/input_method/input_method_engine.h"
 
 #define XK_MISCELLANY
 #include <X11/keysymdef.h>
 #include <X11/X.h>
 #include <X11/Xlib.h>
@@ skipping 417 matching lines @@
   IMEInputContextHandlerInterface* input_context =
       IMEBridge::Get()->GetInputContextHandler();
   if (input_context)
     input_context->DeleteSurroundingText(offset, number_of_chars);
 
   return true;
 }
 
 void InputMethodEngine::HideInputView() {
   keyboard::KeyboardController* keyboard_controller =
-    ash::Shell::GetInstance()->keyboard_controller();
+    keyboard::KeyboardController::GetInstance();
   if (keyboard_controller) {
     keyboard_controller->HideKeyboard(
         keyboard::KeyboardController::HIDE_REASON_MANUAL);
   }
 }
 
 void InputMethodEngine::FocusIn(
     const IMEEngineHandlerInterface::InputContext& input_context) {
   focused_ = true;
   if (!active_)
@@ skipping 38 matching lines @@
 
 void InputMethodEngine::Enable() {
   active_ = true;
   observer_->OnActivate(engine_id_);
   IMEEngineHandlerInterface::InputContext context(ui::TEXT_INPUT_TYPE_TEXT,
                                                   ui::TEXT_INPUT_MODE_DEFAULT);
   FocusIn(context);
 
   keyboard::SetOverrideContentUrl(input_view_url_);
   keyboard::KeyboardController* keyboard_controller =
-      ash::Shell::GetInstance()->keyboard_controller();
+      keyboard::KeyboardController::GetInstance();
   if (keyboard_controller)
     keyboard_controller->Reload();
 }
 
 void InputMethodEngine::Disable() {
   active_ = false;
   observer_->OnDeactivated(engine_id_);
 
   GURL empty_url;
   keyboard::SetOverrideContentUrl(empty_url);
   keyboard::KeyboardController* keyboard_controller =
-      ash::Shell::GetInstance()->keyboard_controller();
+      keyboard::KeyboardController::GetInstance();
   if (keyboard_controller)
     keyboard_controller->Reload();
 }
 
 void InputMethodEngine::PropertyActivate(const std::string& property_name) {
   observer_->OnMenuItemActivated(engine_id_, property_name);
 }
 
 void InputMethodEngine::Reset() {
   observer_->OnReset(engine_id_);
@@ skipping 115 matching lines @@
           // TODO(nona): Implement it.
           break;
       }
     }
   }
 
   // TODO(nona): Support item.children.
 }
 
 }  // namespace chromeos