Adds IME switching private APIs.

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/extensions/api/input_ime/input_ime_api.h"
 #include "chromeos/ime/extension_ime_util.h"
+#include "chromeos/ime/input_method_descriptor.h"
 #include "chromeos/ime/input_method_manager.h"
 #include "extensions/browser/extension_function_registry.h"
 #include "extensions/browser/extension_system.h"
 
 namespace {
 
 // Prefix, which is used by XKB.
 const char kXkbPrefix[] = "xkb:";
 
 }  // namespace
 
 namespace extensions {
 
-GetInputMethodFunction::GetInputMethodFunction() {
-}
-
-GetInputMethodFunction::~GetInputMethodFunction() {
-}
-
-bool GetInputMethodFunction::RunSync() {
+bool GetCurrentInputMethodFunction::RunSync() {
 #if !defined(OS_CHROMEOS)
   NOTREACHED();
   return false;
 #else
   chromeos::input_method::InputMethodManager* manager =
       chromeos::input_method::InputMethodManager::Get();
-  const std::string input_method = InputMethodAPI::GetInputMethodForXkb(
-      manager->GetCurrentInputMethod().id());
-  SetResult(base::Value::CreateStringValue(input_method));
+  SetResult(
+      base::Value::CreateStringValue(manager->GetCurrentInputMethod().id()));

[not at google - send to devlin, 2014/06/06 16:36:04]

use new base::StringValue not CreateStringValue

[Shu Chen, 2014/06/07 05:31:09]

Done.

   return true;
 #endif
 }
+
+bool SetCurrentInputMethodFunction::RunSync() {
+#if !defined(OS_CHROMEOS)

[not at google - send to devlin, 2014/06/06 16:36:04]

better here (and everywhere) is just EXTENSION_FUNCTION_VALIDATE(false).

[Shu Chen, 2014/06/07 05:31:09]

Done.

+  NOTREACHED();
+  return 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();
+  const std::vector<std::string>& input_methods =
+      manager->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);
+      SetResult(new base::FundamentalValue(true));

[not at google - send to devlin, 2014/06/06 16:36:04]

i.e. just return true here

[Shu Chen, 2014/06/07 05:31:09]

Done.

+      return true;
+    }
+  }
+  SetResult(new base::FundamentalValue(false));
+  return true;

[not at google - send to devlin, 2014/06/06 16:36:04]

then here set _error (like "cannot find ime with id *" or whatever) and return
false.

[Shu Chen, 2014/06/07 05:31:09]

Done.

+#endif
+}
+
+bool GetInputMethodsFunction::RunSync() {
+#if !defined(OS_CHROMEOS)
+  NOTREACHED();
+  return false;
+#else
+  base::ListValue* output = new base::ListValue();
+  chromeos::input_method::InputMethodManager* manager =
+      chromeos::input_method::InputMethodManager::Get();
+  scoped_ptr<chromeos::input_method::InputMethodDescriptors> input_methods =
+      manager->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", input_method.name());
+    val->SetString("indicator", input_method.indicator());
+    output->Append(val);

[not at google - send to devlin, 2014/06/06 16:36:04]

what you have here is totally fine. but a fun class is
extensions::DictionaryBuilder (in extensions/common/value_builder.h:
https://code.google.com/p/chromium/codesearch#chromium/src/extensions/common/...)
which would let you write just

extensions::ListBuilder output;
...
for (...) {
  output.Append(DictionaryBuilder()
    .Set("id", input_method.id())
    .Set("name", input_method.name())
    .Set("indicator", input_method.indicator()));
}
SetResult(output.Build());

[Shu Chen, 2014/06/07 05:31:09]

Just found that value_builder.cc is only for test purpose for now. So I'd like
to remain the current implementation.

[not at google - send to devlin, 2014/06/10 19:48:27]

bummer. ok, there's actually no reason that should be test-only. if you want you
could move it from the test-only gyp to the common-gyp and use it, but I
understand if you don't want to do that for this change.

+  }
+  SetResult(output);
+  return true;
+#endif
+}
 
 StartImeFunction::StartImeFunction() {
 }
 
 StartImeFunction::~StartImeFunction() {
 }
 
 bool StartImeFunction::RunSync() {
 #if !defined(OS_CHROMEOS)
   NOTREACHED();
   return false;
 #else
   chromeos::InputMethodEngineInterface* engine =
       InputImeEventRouter::GetInstance()->GetActiveEngine(extension_id());
   if (engine)
     engine->NotifyImeReady();
   return true;
 #endif
 }
 
 // static
 const char InputMethodAPI::kOnInputMethodChanged[] =
     "inputMethodPrivate.onChanged";
 
 InputMethodAPI::InputMethodAPI(content::BrowserContext* context)
     : context_(context) {
   EventRouter::Get(context_)->RegisterObserver(this, kOnInputMethodChanged);
   ExtensionFunctionRegistry* registry =
       ExtensionFunctionRegistry::GetInstance();
-  registry->RegisterFunction<GetInputMethodFunction>();
+  registry->RegisterFunction<GetCurrentInputMethodFunction>();
+  registry->RegisterFunction<SetCurrentInputMethodFunction>();
+  registry->RegisterFunction<GetInputMethodsFunction>();
   registry->RegisterFunction<StartImeFunction>();

[not at google - send to devlin, 2014/06/06 16:36:04]

you shouldn't actually need these RegisterFunction calls because the schema
compiler will do it automatically.

[not at google - send to devlin, 2014/06/06 16:38:11]

never mind, looks like the ime private API doesn't go through the schema
compiler.

 }
 
 InputMethodAPI::~InputMethodAPI() {
 }
 
 // static
 std::string InputMethodAPI::GetInputMethodForXkb(const std::string& xkb_id) {
   std::string xkb_prefix =
       chromeos::extension_ime_util::GetInputMethodIDByEngineID(kXkbPrefix);
   size_t prefix_length = xkb_prefix.length();
@@ skipping 18 matching lines @@
 static base::LazyInstance<BrowserContextKeyedAPIFactory<InputMethodAPI> >
     g_factory = LAZY_INSTANCE_INITIALIZER;
 
 // static
 BrowserContextKeyedAPIFactory<InputMethodAPI>*
 InputMethodAPI::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
 }  // namespace extensions