Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(143)

Unified Diff: ui/base/ime/remote_input_method_win_unittest.cc

Issue 1163603004: Remove candidate show/hide/update related code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/ime/remote_input_method_win.cc ('k') | ui/base/ime/text_input_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ime/remote_input_method_win_unittest.cc
diff --git a/ui/base/ime/remote_input_method_win_unittest.cc b/ui/base/ime/remote_input_method_win_unittest.cc
index f92029d4c1b59a594114451de9fc85852dc2985a..a49662bfd84493e32515c06fbdd30317a36bfa37 100644
--- a/ui/base/ime/remote_input_method_win_unittest.cc
+++ b/ui/base/ime/remote_input_method_win_unittest.cc
@@ -31,9 +31,7 @@ class MockTextInputClient : public DummyTextInputClient {
call_count_set_composition_text_(0),
call_count_insert_char_(0),
call_count_insert_text_(0),
- emulate_pepper_flash_(false),
- is_candidate_window_shown_called_(false),
- is_candidate_window_hidden_called_(false) {
+ emulate_pepper_flash_(false) {
}
size_t call_count_set_composition_text() const {
@@ -48,12 +46,6 @@ class MockTextInputClient : public DummyTextInputClient {
size_t call_count_insert_text() const {
return call_count_insert_text_;
}
- bool is_candidate_window_shown_called() const {
- return is_candidate_window_shown_called_;
- }
- bool is_candidate_window_hidden_called() const {
- return is_candidate_window_hidden_called_;
- }
void Reset() {
text_input_type_ = TEXT_INPUT_TYPE_NONE;
text_input_mode_ = TEXT_INPUT_MODE_DEFAULT;
@@ -64,8 +56,6 @@ class MockTextInputClient : public DummyTextInputClient {
caret_bounds_ = gfx::Rect();
composition_character_bounds_.clear();
emulate_pepper_flash_ = false;
- is_candidate_window_shown_called_ = false;
- is_candidate_window_hidden_called_ = false;
}
void set_text_input_type(ui::TextInputType type) {
text_input_type_ = type;
@@ -123,12 +113,6 @@ class MockTextInputClient : public DummyTextInputClient {
*range = gfx::Range(0, composition_character_bounds_.size());
return true;
}
- void OnCandidateWindowShown() override {
- is_candidate_window_shown_called_ = true;
- }
- void OnCandidateWindowHidden() override {
- is_candidate_window_hidden_called_ = true;
- }
ui::TextInputType text_input_type_;
ui::TextInputMode text_input_mode_;
@@ -139,8 +123,6 @@ class MockTextInputClient : public DummyTextInputClient {
size_t call_count_insert_char_;
size_t call_count_insert_text_;
bool emulate_pepper_flash_;
- bool is_candidate_window_shown_called_;
- bool is_candidate_window_hidden_called_;
DISALLOW_COPY_AND_ASSIGN(MockTextInputClient);
};
@@ -303,19 +285,13 @@ TEST(RemoteInputMethodWinTest, OnCandidatePopupChanged) {
MockTextInputClient mock_text_input_client;
input_method->SetFocusedTextInputClient(&mock_text_input_client);
- ASSERT_FALSE(mock_text_input_client.is_candidate_window_shown_called());
- ASSERT_FALSE(mock_text_input_client.is_candidate_window_hidden_called());
mock_text_input_client.Reset();
private_ptr->OnCandidatePopupChanged(true);
EXPECT_TRUE(input_method->IsCandidatePopupOpen());
- EXPECT_TRUE(mock_text_input_client.is_candidate_window_shown_called());
- EXPECT_FALSE(mock_text_input_client.is_candidate_window_hidden_called());
private_ptr->OnCandidatePopupChanged(false);
EXPECT_FALSE(input_method->IsCandidatePopupOpen());
- EXPECT_TRUE(mock_text_input_client.is_candidate_window_shown_called());
- EXPECT_TRUE(mock_text_input_client.is_candidate_window_hidden_called());
}
TEST(RemoteInputMethodWinTest, CancelComposition) {
« no previous file with comments | « ui/base/ime/remote_input_method_win.cc ('k') | ui/base/ime/text_input_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698