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

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

Issue 81023002: Remove dead code unnecessarily added by r231563 and 236449 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 7 years, 1 month 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/input_method_tsf.cc ('k') | ui/base/ime/remote_input_method_win_unittest.cc » ('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.cc
diff --git a/ui/base/ime/remote_input_method_win.cc b/ui/base/ime/remote_input_method_win.cc
index 7fd1f089c6f37f7451ca290a1501bbe26a17ee36..cc5fc20156c730b3626651823a9e21749c80dd2a 100644
--- a/ui/base/ime/remote_input_method_win.cc
+++ b/ui/base/ime/remote_input_method_win.cc
@@ -108,8 +108,6 @@ class RemoteInputMethodWin : public InputMethod,
: delegate_(delegate),
remote_delegate_(NULL),
text_input_client_(NULL),
- current_input_type_(ui::TEXT_INPUT_TYPE_NONE),
- current_input_mode_(ui::TEXT_INPUT_MODE_DEFAULT),
is_candidate_popup_open_(false),
is_ime_(false),
langid_(kFallbackLangID) {
@@ -130,20 +128,12 @@ class RemoteInputMethodWin : public InputMethod,
}
virtual void Init(bool focused) OVERRIDE {
- if (focused)
- OnFocus();
}
virtual void OnFocus() OVERRIDE {
- FOR_EACH_OBSERVER(InputMethodObserver,
- observer_list_,
- OnFocus());
}
virtual void OnBlur() OVERRIDE {
- FOR_EACH_OBSERVER(InputMethodObserver,
- observer_list_,
- OnBlur());
}
virtual bool OnUntranslatedIMEMessage(const base::NativeEvent& event,
@@ -160,8 +150,6 @@ class RemoteInputMethodWin : public InputMethod,
input_scopes_ = GetInputScopesAsInt(client->GetTextInputType(),
client->GetTextInputMode());
composition_character_bounds_ = GetCompositionCharacterBounds(client);
- current_input_type_ = client->GetTextInputType();
- current_input_mode_ = client->GetTextInputMode();
}
const bool text_input_client_changed = text_input_client_ != client;
@@ -219,11 +207,6 @@ class RemoteInputMethodWin : public InputMethod,
virtual void OnTextInputTypeChanged(const TextInputClient* client) OVERRIDE {
if (!text_input_client_ || text_input_client_ != client)
return;
- const ui::TextInputType prev_type = current_input_type_;
- const ui::TextInputMode prev_mode = current_input_mode_;
- current_input_type_ = client->GetTextInputType();
- current_input_mode_ = client->GetTextInputMode();
-
std::vector<int32> prev_input_scopes;
std::swap(input_scopes_, prev_input_scopes);
input_scopes_ = GetInputScopesAsInt(client->GetTextInputType(),
@@ -232,11 +215,6 @@ class RemoteInputMethodWin : public InputMethod,
remote_delegate_->OnTextInputClientUpdated(
input_scopes_, composition_character_bounds_);
}
- if (current_input_type_ != prev_type || current_input_mode_ != prev_mode) {
- FOR_EACH_OBSERVER(InputMethodObserver,
- observer_list_,
- OnTextInputTypeChanged(client));
- }
}
virtual void OnCaretBoundsChanged(const TextInputClient* client) OVERRIDE {
@@ -249,9 +227,6 @@ class RemoteInputMethodWin : public InputMethod,
remote_delegate_->OnTextInputClientUpdated(
input_scopes_, composition_character_bounds_);
}
- FOR_EACH_OBSERVER(InputMethodObserver,
- observer_list_,
- OnCaretBoundsChanged(client));
}
virtual void CancelComposition(const TextInputClient* client) OVERRIDE {
@@ -377,8 +352,6 @@ class RemoteInputMethodWin : public InputMethod,
internal::RemoteInputMethodDelegateWin* remote_delegate_;
TextInputClient* text_input_client_;
- ui::TextInputType current_input_type_;
- ui::TextInputMode current_input_mode_;
std::vector<int32> input_scopes_;
std::vector<gfx::Rect> composition_character_bounds_;
bool is_candidate_popup_open_;
« no previous file with comments | « ui/base/ime/input_method_tsf.cc ('k') | ui/base/ime/remote_input_method_win_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698