Make InputMethodEngine manage its descriptor.

chrome/browser/chromeos/input_method/input_method_engine.cc

 // Copyright 2013 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.h"
 
 #define XK_MISCELLANY
 #include <X11/keysymdef.h>
 #include <X11/X.h>
 #include <X11/Xlib.h>
@@ skipping 47 matching lines @@
       active_(false),
       context_id_(0),
       next_context_id_(1),
       observer_(NULL),
       preedit_text_(new IBusText()),
       preedit_cursor_(0),
       candidate_window_(new input_method::CandidateWindow()),
       window_visible_(false) {}
 
 InputMethodEngine::~InputMethodEngine() {
-  input_method::InputMethodManager::Get()->RemoveInputMethodExtension(ibus_id_);
+  input_method::InputMethodManager::Get()->RemoveInputMethodExtension(imm_id_);
 }
 
 void InputMethodEngine::Initialize(
     InputMethodEngineInterface::Observer* observer,
     const char* engine_name,
     const char* extension_id,
     const char* engine_id,
     const std::vector<std::string>& languages,
     const std::vector<std::string>& layouts,
     const GURL& options_page,
     const GURL& input_view) {
   DCHECK(observer) << "Observer must not be null.";
 
+  // TODO(komatsu): It is probably better to set observer out of Initialize.
   observer_ = observer;
   engine_id_ = engine_id;
 
   input_method::InputMethodManager* manager =
       input_method::InputMethodManager::Get();
-  ComponentExtensionIMEManager* comp_ext_ime_manager
-      = manager->GetComponentExtensionIMEManager();
+  ComponentExtensionIMEManager* comp_ext_ime_manager =
+      manager->GetComponentExtensionIMEManager();
 
   if (comp_ext_ime_manager->IsInitialized() &&
       comp_ext_ime_manager->IsWhitelistedExtension(extension_id)) {
-    ibus_id_ = comp_ext_ime_manager->GetId(extension_id, engine_id);
+    imm_id_ = comp_ext_ime_manager->GetId(extension_id, engine_id);
   } else {
-    ibus_id_ = extension_ime_util::GetInputMethodID(extension_id, engine_id);
+    imm_id_ = extension_ime_util::GetInputMethodID(extension_id, engine_id);
   }
 
   input_view_url_ = input_view;
+  descriptor_ = input_method::InputMethodDescriptor(imm_id_,
+                                                    engine_name,
+                                                    layouts,
+                                                    languages,
+                                                    false,  // is_login_keyboard
+                                                    options_page,
+                                                    input_view);
 
-  manager->AddInputMethodExtension(ibus_id_, engine_name, layouts, languages,
-                                   options_page, input_view, this);
+  // TODO(komatsu): It is probably better to call AddInputMethodExtension
+  // out of Initialize.
+  manager->AddInputMethodExtension(imm_id_, this);
+}
+
+const input_method::InputMethodDescriptor& InputMethodEngine::GetDescriptor()
+    const {
+  return descriptor_;
 }
 
 void InputMethodEngine::StartIme() {
   input_method::InputMethodManager* manager =
       input_method::InputMethodManager::Get();
-  if (manager && ibus_id_ == manager->GetCurrentInputMethod().id())
+  if (manager && imm_id_ == manager->GetCurrentInputMethod().id())
     Enable();
 }
 
 bool InputMethodEngine::SetComposition(
     int context_id,
     const char* text,
     int selection_start,
     int selection_end,
     int cursor,
     const std::vector<SegmentInfo>& segments,
@@ skipping 483 matching lines @@
           // TODO(nona): Implement it.
           break;
       }
     }
   }
 
   // TODO(nona): Support item.children.
 }
 
 }  // namespace chromeos