Extract Extension IME related utility.

chrome/browser/chromeos/input_method/input_method_manager_impl.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/input_method/input_method_manager_impl.h"
 
 #include <algorithm>  // std::find
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/chromeos/input_method/candidate_window_controller.h"
 #include "chrome/browser/chromeos/input_method/input_method_engine_ibus.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/ibus/ibus_input_context_client.h"
+#include "chromeos/ime/extension_ime_util.h"
 #include "chromeos/ime/input_method_delegate.h"
 #include "third_party/icu/public/common/unicode/uloc.h"
 #include "ui/base/accelerators/accelerator.h"
 
 namespace chromeos {
 namespace input_method {
 
 namespace {
 
 bool Contains(const std::vector<std::string>& container,
@@ skipping 160 matching lines @@
 
   if (new_active_input_method_ids_filtered.empty()) {
     DVLOG(1) << "EnableInputMethods: No valid input method ID";
     return false;
   }
 
   // Copy extension IDs to |new_active_input_method_ids_filtered|. We have to
   // keep relative order of the extension input method IDs.
   for (size_t i = 0; i < active_input_method_ids_.size(); ++i) {
     const std::string& input_method_id = active_input_method_ids_[i];
-    if (InputMethodUtil::IsExtensionInputMethod(input_method_id))
+    if (extension_ime_util::IsExtensionIME(input_method_id))
       new_active_input_method_ids_filtered.push_back(input_method_id);
   }
   active_input_method_ids_.swap(new_active_input_method_ids_filtered);
 
   if (ContainOnlyKeyboardLayout(active_input_method_ids_)) {
     // Do NOT call ibus_controller_->Stop(); here to work around a crash issue
     // at crosbug.com/27051.
     // TODO(yusukes): We can safely call Stop(); here once crosbug.com/26443
     // is implemented.
   } else {
@@ skipping 66 matching lines @@
     if (input_context)
       input_context->SetIsXKBLayout(true);
   } else {
     ibus_controller_->ChangeInputMethod(input_method_id_to_switch);
     if (input_context)
       input_context->SetIsXKBLayout(false);
   }
 
   if (current_input_method_.id() != input_method_id_to_switch) {
     const InputMethodDescriptor* descriptor = NULL;
-    if (!InputMethodUtil::IsExtensionInputMethod(input_method_id_to_switch)) {
+    if (!extension_ime_util::IsExtensionIME(input_method_id_to_switch)) {
       descriptor =
           util_.GetInputMethodDescriptorFromId(input_method_id_to_switch);
     } else {
       std::map<std::string, InputMethodDescriptor>::const_iterator i =
           extra_input_methods_.find(input_method_id_to_switch);
       DCHECK(i != extra_input_methods_.end());
       descriptor = &(i->second);
     }
     DCHECK(descriptor);
 
@@ skipping 22 matching lines @@
 
 void InputMethodManagerImpl::AddInputMethodExtension(
     const std::string& id,
     const std::string& name,
     const std::vector<std::string>& layouts,
     const std::string& language,
     InputMethodEngine* engine) {
   if (state_ == STATE_TERMINATING)
     return;
 
-  if (!InputMethodUtil::IsExtensionInputMethod(id)) {
+  if (!extension_ime_util::IsExtensionIME(id)) {
     DVLOG(1) << id << " is not a valid extension input method ID.";
     return;
   }
 
   const std::string layout = layouts.empty() ? "" : layouts[0];
   extra_input_methods_[id] =
       InputMethodDescriptor(id, name, layout, language, true);
   if (!Contains(filtered_extension_imes_, id)) {
     if (!Contains(active_input_method_ids_, id)) {
       active_input_method_ids_.push_back(id);
     } else {
       DVLOG(1) << "AddInputMethodExtension: alread added: "
                << id << ", " << name;
       // Call Start() anyway, just in case.
     }
 
     // Ensure that the input method daemon is running.
     MaybeInitializeCandidateWindowController();
     IBusDaemonController::GetInstance()->Start();
   }
 
   extra_input_method_instances_[id] =
       static_cast<InputMethodEngineIBus*>(engine);
 }
 
 void InputMethodManagerImpl::RemoveInputMethodExtension(const std::string& id) {
-  if (!InputMethodUtil::IsExtensionInputMethod(id))
+  if (!extension_ime_util::IsExtensionIME(id))
     DVLOG(1) << id << " is not a valid extension input method ID.";
 
   std::vector<std::string>::iterator i = std::find(
       active_input_method_ids_.begin(), active_input_method_ids_.end(), id);
   if (i != active_input_method_ids_.end())
     active_input_method_ids_.erase(i);
   extra_input_methods_.erase(id);
 
   if (ContainOnlyKeyboardLayout(active_input_method_ids_)) {
     // Do NOT call ibus_controller_->Stop(); here to work around a crash issue
@@ skipping 327 matching lines @@
   candidate_window_controller_.reset(
       CandidateWindowController::CreateCandidateWindowController());
   if (candidate_window_controller_->Init(ibus_controller_.get()))
     candidate_window_controller_->AddObserver(this);
   else
     DVLOG(1) << "Failed to initialize the candidate window controller";
 }
 
 }  // namespace input_method
 }  // namespace chromeos