Commit 915ca835 authored by kinaba@chromium.org's avatar kinaba@chromium.org

Libcros version-up for preedit text monitoring on ChromeOS.

This is going to be used for fixing crosbug.com/13374, by
adding a display area for preedits on a candidate window.
This patch is just for updating libcros in Chromium to version 150:
http://gerrit.chromium.org/gerrit/2288

BUG=chromium-os:13374
TEST=boot ChromeOS and verify it runs safely.

Review URL: http://codereview.chromium.org/7108022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88640 0039d316-1c4b-4281-b951-d872f2087c98
parent 37547d00
...@@ -585,6 +585,16 @@ class CandidateWindowController::Impl : public CandidateWindowView::Observer { ...@@ -585,6 +585,16 @@ class CandidateWindowController::Impl : public CandidateWindowView::Observer {
static void OnUpdateLookupTable(void* input_method_library, static void OnUpdateLookupTable(void* input_method_library,
const InputMethodLookupTable& lookup_table); 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. // This function is called by libcros when ibus connects or disconnects.
// |input_method_library| is a void pointer to this object. // |input_method_library| is a void pointer to this object.
static void OnConnectionChange(void* input_method_library, bool connected); static void OnConnectionChange(void* input_method_library, bool connected);
...@@ -1247,6 +1257,10 @@ bool CandidateWindowController::Impl::Init() { ...@@ -1247,6 +1257,10 @@ bool CandidateWindowController::Impl::Init() {
MonitorInputMethodConnection( MonitorInputMethodConnection(
ui_status_connection_, ui_status_connection_,
&CandidateWindowController::Impl::OnConnectionChange); &CandidateWindowController::Impl::OnConnectionChange);
MonitorInputMethodPreeditText(
ui_status_connection_,
&CandidateWindowController::Impl::OnHidePreeditText,
&CandidateWindowController::Impl::OnUpdatePreeditText);
// Create the candidate window view. // Create the candidate window view.
CreateView(); CreateView();
...@@ -1296,6 +1310,10 @@ void CandidateWindowController::Impl::OnHideLookupTable( ...@@ -1296,6 +1310,10 @@ void CandidateWindowController::Impl::OnHideLookupTable(
controller->candidate_window_->HideLookupTable(); controller->candidate_window_->HideLookupTable();
} }
void CandidateWindowController::Impl::OnHidePreeditText(
void* input_method_library) {
}
void CandidateWindowController::Impl::OnSetCursorLocation( void CandidateWindowController::Impl::OnSetCursorLocation(
void* input_method_library, void* input_method_library,
int x, int x,
...@@ -1356,6 +1374,11 @@ void CandidateWindowController::Impl::OnUpdateLookupTable( ...@@ -1356,6 +1374,11 @@ void CandidateWindowController::Impl::OnUpdateLookupTable(
controller->frame_->Show(); 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, void CandidateWindowController::Impl::OnCandidateCommitted(int index,
int button, int button,
int flags) { int flags) {
......
...@@ -4,5 +4,5 @@ vars = { ...@@ -4,5 +4,5 @@ vars = {
deps = { deps = {
"src/third_party/cros": "src/third_party/cros":
Var("chromium_git") + "/cros.git@39469643", Var("chromium_git") + "/cros.git@411943e7",
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment