Make keyboard controller a singleton.

chrome/browser/extensions/api/input/input.cc

 // Copyright 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 "chrome/browser/extensions/api/input/input.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string16.h"
@@ skipping 93 matching lines @@
 bool VirtualKeyboardPrivateHideKeyboardFunction::RunImpl() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 #if defined(USE_ASH)
   UMA_HISTOGRAM_ENUMERATION(
       "VirtualKeyboard.KeyboardControlEvent",
       keyboard::KEYBOARD_CONTROL_HIDE_USER,
       keyboard::KEYBOARD_CONTROL_MAX);
 
   // Pass HIDE_REASON_MANUAL since calls to HideKeyboard as part of this API
   // would be user generated.
-  ash::Shell::GetInstance()->keyboard_controller()->HideKeyboard(
+  keyboard::KeyboardController::GetInstance()->HideKeyboard(
       keyboard::KeyboardController::HIDE_REASON_MANUAL);
 
   return true;
 #else
   error_ = kNotYetImplementedError;
   return false;
 #endif
 }
 
 bool VirtualKeyboardPrivateLockKeyboardFunction::RunImpl() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 #if defined(USE_ASH)
   bool lock;
   EXTENSION_FUNCTION_VALIDATE(args_->GetBoolean(0, &lock));
-  ash::Shell::GetInstance()->keyboard_controller()->set_lock_keyboard(lock);
+  keyboard::KeyboardController::GetInstance()->set_lock_keyboard(lock);
   return true;
 #else
   error_ = kNotYetImplementedError;
   return false;
 #endif
 }
 
 bool VirtualKeyboardPrivateKeyboardLoadedFunction::RunImpl() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 #if defined(USE_ASH)
@@ skipping 27 matching lines @@
 
 static base::LazyInstance<BrowserContextKeyedAPIFactory<InputAPI> > g_factory =
     LAZY_INSTANCE_INITIALIZER;
 
 // static
 BrowserContextKeyedAPIFactory<InputAPI>* InputAPI::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
 }  // namespace extensions