summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/input_method/input_method_engine.h
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/chromeos/input_method/input_method_engine.h')
-rw-r--r--chrome/browser/chromeos/input_method/input_method_engine.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/input_method/input_method_engine.h b/chrome/browser/chromeos/input_method/input_method_engine.h
index 7763095..5c0efb9 100644
--- a/chrome/browser/chromeos/input_method/input_method_engine.h
+++ b/chrome/browser/chromeos/input_method/input_method_engine.h
@@ -9,6 +9,7 @@
#include <string>
#include <vector>
#include "chrome/browser/chromeos/input_method/input_method_engine_interface.h"
+#include "chromeos/ime/input_method_descriptor.h"
#include "url/gurl.h"
namespace ui {
@@ -42,6 +43,8 @@ class InputMethodEngine : public InputMethodEngineInterface {
const GURL& input_view);
// InputMethodEngineInterface overrides.
+ virtual const input_method::InputMethodDescriptor& GetDescriptor()
+ const OVERRIDE;
virtual void StartIme() OVERRIDE;
virtual bool SetComposition(int context_id,
const char* text,
@@ -96,6 +99,9 @@ class InputMethodEngine : public InputMethodEngineInterface {
void MenuItemToProperty(const MenuItem& item,
input_method::InputMethodProperty* property);
+ // Descriptor of this input method.
+ input_method::InputMethodDescriptor descriptor_;
+
// True if the current context has focus.
bool focused_;
@@ -111,8 +117,8 @@ class InputMethodEngine : public InputMethodEngineInterface {
// This IME ID in Chrome Extension.
std::string engine_id_;
- // This IME ID in ibus.
- std::string ibus_id_;
+ // This IME ID in InputMethodManager.
+ std::string imm_id_;
// Pointer to the object recieving events for this IME.
InputMethodEngineInterface::Observer* observer_;