summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkomatsu@chromium.org <komatsu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-18 08:16:32 +0000
committerkomatsu@chromium.org <komatsu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-18 08:16:32 +0000
commitd1803bb76fc4081251ccd3923b0acd1c421eeff6 (patch)
tree84a7cbac3884c4865ca76159276bfa420bcd1310
parentc28e524161136c65d951b0679feb946b8a7ec8e7 (diff)
downloadchromium_src-d1803bb76fc4081251ccd3923b0acd1c421eeff6.zip
chromium_src-d1803bb76fc4081251ccd3923b0acd1c421eeff6.tar.gz
chromium_src-d1803bb76fc4081251ccd3923b0acd1c421eeff6.tar.bz2
Delete UpdateLookupTable from IbusEngineService.
BUG=293117 Review URL: https://chromiumcodereview.appspot.com/24162002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223821 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/input_method/input_method_engine_ibus.cc49
-rw-r--r--chromeos/dbus/ibus/ibus_engine_service.cc9
-rw-r--r--chromeos/dbus/ibus/ibus_engine_service.h3
-rw-r--r--chromeos/dbus/ibus/mock_ibus_engine_service.cc12
-rw-r--r--chromeos/dbus/ibus/mock_ibus_engine_service.h18
5 files changed, 38 insertions, 53 deletions
diff --git a/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc b/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc
index 1c8a374..6320ff9 100644
--- a/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc
+++ b/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc
@@ -228,7 +228,10 @@ bool InputMethodEngineIBus::SetCandidateWindowVisible(bool visible,
}
window_visible_ = visible;
- GetCurrentService()->UpdateLookupTable(*table_.get(), window_visible_);
+ IBusPanelCandidateWindowHandlerInterface* candidate_window =
+ IBusBridge::Get()->GetCandidateWindowHandler();
+ if (candidate_window)
+ candidate_window->UpdateLookupTable(*table_, window_visible_);
return true;
}
@@ -241,21 +244,33 @@ void InputMethodEngineIBus::SetCandidateWindowCursorVisible(bool visible) {
// IMEs do not depend on the pagination feature of IBus.
if (!visible)
table_->set_cursor_position(0);
- if (active_)
- GetCurrentService()->UpdateLookupTable(*table_.get(), window_visible_);
+ if (active_) {
+ IBusPanelCandidateWindowHandlerInterface* candidate_window =
+ IBusBridge::Get()->GetCandidateWindowHandler();
+ if (candidate_window)
+ candidate_window->UpdateLookupTable(*table_, window_visible_);
+ }
}
void InputMethodEngineIBus::SetCandidateWindowVertical(bool vertical) {
table_->set_orientation(vertical ? IBusLookupTable::VERTICAL :
IBusLookupTable::HORIZONTAL);
- if (active_)
- GetCurrentService()->UpdateLookupTable(*table_.get(), window_visible_);
+ if (active_) {
+ IBusPanelCandidateWindowHandlerInterface* candidate_window =
+ IBusBridge::Get()->GetCandidateWindowHandler();
+ if (candidate_window)
+ candidate_window->UpdateLookupTable(*table_, window_visible_);
+ }
}
void InputMethodEngineIBus::SetCandidateWindowPageSize(int size) {
table_->set_page_size(size);
- if (active_)
- GetCurrentService()->UpdateLookupTable(*table_.get(), window_visible_);
+ if (active_) {
+ IBusPanelCandidateWindowHandlerInterface* candidate_window =
+ IBusBridge::Get()->GetCandidateWindowHandler();
+ if (candidate_window)
+ candidate_window->UpdateLookupTable(*table_, window_visible_);
+ }
}
void InputMethodEngineIBus::SetCandidateWindowAuxText(const char* text) {
@@ -281,8 +296,12 @@ void InputMethodEngineIBus::SetCandidateWindowAuxTextVisible(bool visible) {
void InputMethodEngineIBus::SetCandidateWindowPosition(
CandidateWindowPosition position) {
table_->set_show_window_at_composition(position == WINDOW_POS_COMPOSITTION);
- if (active_)
- GetCurrentService()->UpdateLookupTable(*table_.get(), window_visible_);
+ if (active_) {
+ IBusPanelCandidateWindowHandlerInterface* candidate_window =
+ IBusBridge::Get()->GetCandidateWindowHandler();
+ if (candidate_window)
+ candidate_window->UpdateLookupTable(*table_, window_visible_);
+ }
}
bool InputMethodEngineIBus::SetCandidates(
@@ -317,7 +336,12 @@ bool InputMethodEngineIBus::SetCandidates(
table_->mutable_candidates()->push_back(entry);
}
- GetCurrentService()->UpdateLookupTable(*table_.get(), window_visible_);
+ if (active_) {
+ IBusPanelCandidateWindowHandlerInterface* candidate_window =
+ IBusBridge::Get()->GetCandidateWindowHandler();
+ if (candidate_window)
+ candidate_window->UpdateLookupTable(*table_, window_visible_);
+ }
return true;
}
@@ -340,7 +364,10 @@ bool InputMethodEngineIBus::SetCursorPosition(int context_id, int candidate_id,
}
table_->set_cursor_position(position->second);
- GetCurrentService()->UpdateLookupTable(*table_.get(), window_visible_);
+ IBusPanelCandidateWindowHandlerInterface* candidate_window =
+ IBusBridge::Get()->GetCandidateWindowHandler();
+ if (candidate_window)
+ candidate_window->UpdateLookupTable(*table_, window_visible_);
return true;
}
diff --git a/chromeos/dbus/ibus/ibus_engine_service.cc b/chromeos/dbus/ibus/ibus_engine_service.cc
index 00a3c3d..7ad0658 100644
--- a/chromeos/dbus/ibus/ibus_engine_service.cc
+++ b/chromeos/dbus/ibus/ibus_engine_service.cc
@@ -54,15 +54,6 @@ class IBusEngineServiceDaemonlessImpl : public IBusEngineService {
}
// IBusEngineService override.
- virtual void UpdateLookupTable(const IBusLookupTable& lookup_table,
- bool is_visible) OVERRIDE {
- IBusPanelCandidateWindowHandlerInterface* candidate_window =
- IBusBridge::Get()->GetCandidateWindowHandler();
- if (candidate_window)
- candidate_window->UpdateLookupTable(lookup_table, is_visible);
- }
-
- // IBusEngineService override.
virtual void UpdateProperty(const IBusProperty& property) OVERRIDE {
IBusPanelPropertyHandlerInterface* property_handler =
IBusBridge::Get()->GetPropertyHandler();
diff --git a/chromeos/dbus/ibus/ibus_engine_service.h b/chromeos/dbus/ibus/ibus_engine_service.h
index c6bfccb..22448c6 100644
--- a/chromeos/dbus/ibus/ibus_engine_service.h
+++ b/chromeos/dbus/ibus/ibus_engine_service.h
@@ -52,9 +52,6 @@ class CHROMEOS_EXPORT IBusEngineService {
// Emits UpdateAuxiliaryText signal.
virtual void UpdateAuxiliaryText(const IBusText& ibus_text,
bool is_visible) = 0;
- // Emits UpdateLookupTable signal.
- virtual void UpdateLookupTable(const IBusLookupTable& lookup_table,
- bool is_visible) = 0;
// Emits UpdateProperty signal.
virtual void UpdateProperty(const IBusProperty& property) = 0;
// Emits ForwardKeyEvent signal.
diff --git a/chromeos/dbus/ibus/mock_ibus_engine_service.cc b/chromeos/dbus/ibus/mock_ibus_engine_service.cc
index 92d1cb2..8d7295c 100644
--- a/chromeos/dbus/ibus/mock_ibus_engine_service.cc
+++ b/chromeos/dbus/ibus/mock_ibus_engine_service.cc
@@ -12,14 +12,12 @@ MockIBusEngineService::MockIBusEngineService()
: register_properties_call_count_(0),
update_preedit_call_count_(0),
update_auxiliary_text_call_count_(0),
- update_lookup_table_call_count_(0),
update_property_call_count_(0),
forward_key_event_call_count_(0),
commit_text_call_count_(0),
delete_surrounding_text_call_count_(0),
last_update_preedit_arg_(new UpdatePreeditArg()),
last_update_aux_text_arg_(new UpdateAuxiliaryTextArg()),
- last_update_lookup_table_arg_(new UpdateLookupTableArg()),
last_registered_properties_(new IBusPropertyList()),
last_updated_property_(new IBusProperty()),
last_delete_surrounding_text_arg_(new DeleteSurroundingTextArg()),
@@ -54,14 +52,6 @@ void MockIBusEngineService::UpdateAuxiliaryText(const IBusText& ibus_text,
last_update_aux_text_arg_->is_visible = is_visible;
}
-void MockIBusEngineService::UpdateLookupTable(
- const IBusLookupTable& lookup_table,
- bool is_visible) {
- ++update_lookup_table_call_count_;
- last_update_lookup_table_arg_->lookup_table.CopyFrom(lookup_table);
- last_update_lookup_table_arg_->is_visible = is_visible;
-}
-
void MockIBusEngineService::UpdateProperty(const IBusProperty& property) {
++update_property_call_count_;
last_updated_property_->CopyFrom(property);
@@ -95,7 +85,6 @@ void MockIBusEngineService::Clear() {
register_properties_call_count_ = 0;
update_preedit_call_count_ = 0;
update_auxiliary_text_call_count_ = 0;
- update_lookup_table_call_count_ = 0;
update_property_call_count_ = 0;
forward_key_event_call_count_ = 0;
commit_text_call_count_ = 0;
@@ -103,7 +92,6 @@ void MockIBusEngineService::Clear() {
last_commit_text_.clear();
last_update_preedit_arg_.reset(new UpdatePreeditArg());
last_update_aux_text_arg_.reset(new UpdateAuxiliaryTextArg());
- last_update_lookup_table_arg_.reset(new UpdateLookupTableArg());
last_registered_properties_.reset(new IBusPropertyList());
last_updated_property_.reset(new IBusProperty());
last_delete_surrounding_text_arg_.reset(new DeleteSurroundingTextArg());
diff --git a/chromeos/dbus/ibus/mock_ibus_engine_service.h b/chromeos/dbus/ibus/mock_ibus_engine_service.h
index e32ec96..0ecd313 100644
--- a/chromeos/dbus/ibus/mock_ibus_engine_service.h
+++ b/chromeos/dbus/ibus/mock_ibus_engine_service.h
@@ -8,7 +8,6 @@
#include <string>
#include "chromeos/dbus/ibus/ibus_engine_service.h"
-#include "chromeos/dbus/ibus/ibus_lookup_table.h"
#include "chromeos/dbus/ibus/ibus_property.h"
#include "chromeos/dbus/ibus/ibus_text.h"
@@ -32,12 +31,6 @@ class MockIBusEngineService : public IBusEngineService {
bool is_visible;
};
- struct UpdateLookupTableArg {
- UpdateLookupTableArg() : is_visible(false) {}
- IBusLookupTable lookup_table;
- bool is_visible;
- };
-
struct DeleteSurroundingTextArg {
int32 offset;
uint32 length;
@@ -55,8 +48,6 @@ class MockIBusEngineService : public IBusEngineService {
IBusEnginePreeditFocusOutMode mode) OVERRIDE;
virtual void UpdateAuxiliaryText(const IBusText& ibus_text,
bool is_visible) OVERRIDE;
- virtual void UpdateLookupTable(const IBusLookupTable& lookup_table,
- bool is_visible) OVERRIDE;
virtual void UpdateProperty(const IBusProperty& property) OVERRIDE;
virtual void ForwardKeyEvent(uint32 keyval, uint32 keycode,
uint32 state) OVERRIDE;
@@ -83,13 +74,6 @@ class MockIBusEngineService : public IBusEngineService {
return *last_update_aux_text_arg_.get();
}
- int update_lookup_table_call_count() const {
- return update_lookup_table_call_count_;
- }
- const UpdateLookupTableArg& last_update_lookup_table_arg() const {
- return *last_update_lookup_table_arg_.get();
- }
-
int register_properties_call_count() const {
return register_properties_call_count_;
}
@@ -115,7 +99,6 @@ class MockIBusEngineService : public IBusEngineService {
int register_properties_call_count_;
int update_preedit_call_count_;
int update_auxiliary_text_call_count_;
- int update_lookup_table_call_count_;
int update_property_call_count_;
int forward_key_event_call_count_;
int commit_text_call_count_;
@@ -124,7 +107,6 @@ class MockIBusEngineService : public IBusEngineService {
std::string last_commit_text_;
scoped_ptr<UpdatePreeditArg> last_update_preedit_arg_;
scoped_ptr<UpdateAuxiliaryTextArg> last_update_aux_text_arg_;
- scoped_ptr<UpdateLookupTableArg> last_update_lookup_table_arg_;
scoped_ptr<IBusPropertyList> last_registered_properties_;
scoped_ptr<IBusProperty> last_updated_property_;
scoped_ptr<DeleteSurroundingTextArg> last_delete_surrounding_text_arg_;