Libcros version-up for preedit text monitoring on ChromeOS.

chrome/browser/chromeos/input_method/candidate_window.cc

 // Copyright (c) 2011 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/candidate_window.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 567 matching lines @@
   // in libcros. |input_method_library| is a void pointer to this object.
   static void OnUpdateAuxiliaryText(void* input_method_library,
                                     const std::string& utf8_text,
                                     bool visible);
 
   // The function is called when |UpdateLookupTable| signal is received
   // in libcros. |input_method_library| is a void pointer to this object.
   static void OnUpdateLookupTable(void* input_method_library,
                                   const InputMethodLookupTable& lookup_table);
 
+  // The function is called when |UpdatePreeditText| signal is received
+  // in libcros. |input_method_library| is a void pointer to this object.
+  static void OnUpdatePreeditText(void* input_method_library,
+                                  const std::string& utf8_text,
+                                  unsigned int cursor, bool visible);
+
+  // The function is called when |HidePreeditText| signal is received
+  // in libcros. |input_method_library| is a void pointer to this object.
+  static void OnHidePreeditText(void* input_method_library);
+
   // This function is called by libcros when ibus connects or disconnects.
   // |input_method_library| is a void pointer to this object.
   static void OnConnectionChange(void* input_method_library, bool connected);
 
   // The connection is used for communicating with input method UI logic
   // in libcros.
   InputMethodUiStatusConnection* ui_status_connection_;
 
   // The candidate window view.
   CandidateWindowView* candidate_window_;
@@ skipping 642 matching lines @@
   functions.update_lookup_table =
       &CandidateWindowController::Impl::OnUpdateLookupTable;
   ui_status_connection_ = MonitorInputMethodUiStatus(functions, this);
   if (!ui_status_connection_) {
     LOG(ERROR) << "MonitorInputMethodUiStatus() failed.";
     return false;
   }
   MonitorInputMethodConnection(
       ui_status_connection_,
       &CandidateWindowController::Impl::OnConnectionChange);
+  MonitorInputMethodPreeditText(
+      ui_status_connection_,
+      &CandidateWindowController::Impl::OnHidePreeditText,
+      &CandidateWindowController::Impl::OnUpdatePreeditText);
 
   // Create the candidate window view.
   CreateView();
 
   return true;
 }
 
 void CandidateWindowController::Impl::CreateView() {
   // Create a non-decorated frame.
   frame_.reset(new views::Widget);
@@ skipping 29 matching lines @@
 }
 
 void CandidateWindowController::Impl::OnHideLookupTable(
     void* input_method_library) {
   CandidateWindowController::Impl* controller =
       static_cast<CandidateWindowController::Impl*>(input_method_library);
 
   controller->candidate_window_->HideLookupTable();
 }
 
+void CandidateWindowController::Impl::OnHidePreeditText(
+    void* input_method_library) {
+}
+
 void CandidateWindowController::Impl::OnSetCursorLocation(
     void* input_method_library,
     int x,
     int y,
     int width,
     int height) {
   CandidateWindowController::Impl* controller =
       static_cast<CandidateWindowController::Impl*>(input_method_library);
 
   // A workaround for http://crosbug.com/6460. We should ignore very short Y
@@ skipping 40 matching lines @@
   if (!lookup_table.visible) {
     controller->candidate_window_->HideLookupTable();
     return;
   }
 
   controller->candidate_window_->UpdateCandidates(lookup_table);
   controller->candidate_window_->ResizeAndMoveParentFrame();
   controller->frame_->Show();
 }
 
+void CandidateWindowController::Impl::OnUpdatePreeditText(
+    void* input_method_library,
+    const std::string& utf8_text, unsigned int cursor, bool visible) {
+}
+
 void CandidateWindowController::Impl::OnCandidateCommitted(int index,
                                                            int button,
                                                            int flags) {
   NotifyCandidateClicked(ui_status_connection_, index, button, flags);
 }
 
 void CandidateWindowController::Impl::OnConnectionChange(
     void* input_method_library,
     bool connected) {
   if (!connected) {
     CandidateWindowController::Impl* controller =
         static_cast<CandidateWindowController::Impl*>(input_method_library);
     controller->candidate_window_->HideLookupTable();
   }
 }
 
 CandidateWindowController::CandidateWindowController()
     : impl_(new CandidateWindowController::Impl) {
 }
 
 CandidateWindowController::~CandidateWindowController() {
   delete impl_;
 }
 
 bool CandidateWindowController::Init() {
   return impl_->Init();
 }
 
 }  // namespace chromeos