Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / input_method / input_method_engine.h

diff --git a/src/chrome/browser/chromeos/input_method/input_method_engine.h b/src/chrome/browser/chromeos/input_method/input_method_engine.h
index 0eb4cce..2d3bd1a 100644 (file)
--- a/src/chrome/browser/chromeos/input_method/input_method_engine.h
+++ b/src/chrome/browser/chromeos/input_method/input_method_engine.h
@@ -19,7 +19,7 @@ class KeyEvent;
 
 namespace chromeos {
 
-class IBusText;
+class CompositionText;
 
 namespace input_method {
 struct InputMethodProperty;
@@ -117,6 +117,9 @@ class InputMethodEngine : public InputMethodEngineInterface {
   // This IME ID in Chrome Extension.
   std::string engine_id_;
 
+  // This IME's Chrome Extension ID.
+  std::string extension_id_;
+
   // This IME ID in InputMethodManager.
   std::string imm_id_;
 
@@ -124,8 +127,8 @@ class InputMethodEngine : public InputMethodEngineInterface {
   InputMethodEngineInterface::Observer* observer_;
 
   // The current preedit text, and it's cursor position.
-  scoped_ptr<IBusText> preedit_text_;
-  int preedit_cursor_;
+  scoped_ptr<CompositionText> composition_text_;
+  int composition_cursor_;
 
   // The current candidate window.
   scoped_ptr<ui::CandidateWindow> candidate_window_;
@@ -144,6 +147,10 @@ class InputMethodEngine : public InputMethodEngineInterface {
 
   // Used for input view window.
   GURL input_view_url_;
+
+  // Used with SendKeyEvents and ProcessKeyEvent to check if the key event
+  // sent to ProcessKeyEvent is sent by SendKeyEvents.
+  const ui::KeyEvent* sent_key_event_;
 };
 
 }  // namespace chromeos