Extract Extension IME related utility.

chrome/browser/chromeos/input_method/input_method_engine_ibus.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_engine_ibus.h"
 
 #define XK_MISCELLANY
 #include <X11/keysymdef.h>
 #include <map>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/ibus/ibus_client.h"
 #include "chromeos/dbus/ibus/ibus_component.h"
 #include "chromeos/dbus/ibus/ibus_engine_factory_service.h"
 #include "chromeos/dbus/ibus/ibus_engine_service.h"
 #include "chromeos/dbus/ibus/ibus_lookup_table.h"
 #include "chromeos/dbus/ibus/ibus_property.h"
 #include "chromeos/dbus/ibus/ibus_text.h"
+#include "chromeos/ime/extension_ime_util.h"
 #include "chromeos/ime/ibus_keymap.h"
 #include "dbus/object_path.h"
 
 namespace chromeos {
-const char* kExtensionImePrefix = "_ext_ime_";
 const char* kErrorNotActive = "IME is not active";
 const char* kErrorWrongContext = "Context is not active";
 const char* kCandidateNotFound = "Candidate not found";
 const char* kEngineBusPrefix = "org.freedesktop.IBus.";
 const char* kObjectPathPrefix = "/org/freedesktop/IBus/Engine/";
 
 namespace {
 const uint32 kIBusAltKeyMask = 1 << 3;
 const uint32 kIBusCtrlKeyMask = 1 << 2;
 const uint32 kIBusShiftKeyMask = 1 << 0;
@@ skipping 29 matching lines @@
     const char* extension_id,
     const char* engine_id,
     const char* description,
     const char* language,
     const std::vector<std::string>& layouts,
     std::string* error) {
   DCHECK(observer) << "Observer must not be null.";
 
   observer_ = observer;
   engine_id_ = engine_id;
-  ibus_id_ = kExtensionImePrefix;
-  ibus_id_ += extension_id;
-  ibus_id_ += engine_id;
+  ibus_id_ = extension_ime_util::GetInputMethodID(extension_id, engine_id);
 
   input_method::InputMethodManager* manager =
       input_method::GetInputMethodManager();
   std::string layout;
   if (!layouts.empty()) {
     layout = JoinString(layouts, ',');
   } else {
     const std::string fallback_id =
         manager->GetInputMethodUtil()->GetHardwareInputMethodId();
     const input_method::InputMethodDescriptor* fallback_desc =
@@ skipping 514 matching lines @@
   DBusThreadManager::Get()->RemoveIBusEngineService(object_path_);
 
   current_object_path_++;
   object_path_ = dbus::ObjectPath(kObjectPathPrefix +
                                   base::IntToString(current_object_path_));
   GetCurrentService()->SetEngine(this);
   sender.Run(object_path_);
 }
 
 }  // namespace chromeos