IME refactoring: ChromeOS introduce input methods State.

chrome/browser/chromeos/extensions/input_method_api.cc

 // Copyright (c) 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/chromeos/extensions/input_method_api.h"
 
 #include "base/lazy_instance.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/extensions/input_method_event_router.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
@@ skipping 13 matching lines @@
 }  // namespace
 
 namespace extensions {
 
 ExtensionFunction::ResponseAction GetCurrentInputMethodFunction::Run() {
 #if !defined(OS_CHROMEOS)
   EXTENSION_FUNCTION_VALIDATE(false);
 #else
   chromeos::input_method::InputMethodManager* manager =
       chromeos::input_method::InputMethodManager::Get();
-  return RespondNow(OneArgument(
-      new base::StringValue(manager->GetCurrentInputMethod().id())));
+  return RespondNow(OneArgument(new base::StringValue(
+      manager->GetActiveIMEState()->GetCurrentInputMethod().id())));
 #endif
 }
 
 ExtensionFunction::ResponseAction SetCurrentInputMethodFunction::Run() {
 #if !defined(OS_CHROMEOS)
   EXTENSION_FUNCTION_VALIDATE(false);
 #else
   std::string new_input_method;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &new_input_method));
-  chromeos::input_method::InputMethodManager* manager =
-      chromeos::input_method::InputMethodManager::Get();
+  scoped_refptr<chromeos::input_method::InputMethodManager::State> ime_state =
+      chromeos::input_method::InputMethodManager::Get()->GetActiveIMEState();
   const std::vector<std::string>& input_methods =
-      manager->GetActiveInputMethodIds();
+      ime_state->GetActiveInputMethodIds();
   for (size_t i = 0; i < input_methods.size(); ++i) {
     const std::string& input_method = input_methods[i];
     if (input_method == new_input_method) {
-      manager->ChangeInputMethod(new_input_method);
+      ime_state->ChangeInputMethod(new_input_method, false /* show_message */);
       return RespondNow(NoArguments());
     }
   }
   return RespondNow(Error("Invalid input method id."));
 #endif
 }
 
 ExtensionFunction::ResponseAction GetInputMethodsFunction::Run() {
 #if !defined(OS_CHROMEOS)
   EXTENSION_FUNCTION_VALIDATE(false);
 #else
   base::ListValue* output = new base::ListValue();
   chromeos::input_method::InputMethodManager* manager =
       chromeos::input_method::InputMethodManager::Get();
   chromeos::input_method::InputMethodUtil* util = manager->GetInputMethodUtil();
+  scoped_refptr<chromeos::input_method::InputMethodManager::State> ime_state =
+      manager->GetActiveIMEState();
   scoped_ptr<chromeos::input_method::InputMethodDescriptors> input_methods =
-      manager->GetActiveInputMethods();
+      ime_state->GetActiveInputMethods();
   for (size_t i = 0; i < input_methods->size(); ++i) {
     const chromeos::input_method::InputMethodDescriptor& input_method =
         (*input_methods)[i];
     base::DictionaryValue* val = new base::DictionaryValue();
     val->SetString("id", input_method.id());
     val->SetString("name", util->GetInputMethodLongName(input_method));
     val->SetString("indicator", util->GetInputMethodShortName(input_method));
     output->Append(val);
   }
   return RespondNow(OneArgument(output));
@@ skipping 43 matching lines @@
 static base::LazyInstance<BrowserContextKeyedAPIFactory<InputMethodAPI> >
     g_factory = LAZY_INSTANCE_INITIALIZER;
 
 // static
 BrowserContextKeyedAPIFactory<InputMethodAPI>*
 InputMethodAPI::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
 }  // namespace extensions