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

Unified Diff: ui/views/ime/input_method_bridge.cc

Issue 23749007: Views: Fix keyboard input in linux_aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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/views/ime/input_method_base.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/ime/input_method_bridge.cc
diff --git a/ui/views/ime/input_method_bridge.cc b/ui/views/ime/input_method_bridge.cc
index 760bd59d091241c32d0db278a91b857e0737ddac..8165a60ece4b7e6eb6fc3746690ba13009b0dece 100644
--- a/ui/views/ime/input_method_bridge.cc
+++ b/ui/views/ime/input_method_bridge.cc
@@ -33,8 +33,7 @@ InputMethodBridge::~InputMethodBridge() {
void InputMethodBridge::OnFocus() {
// Direct the shared IME to send TextInputClient messages to |this| object.
- if (IsWidgetActive() &&
- (shared_input_method_ || !host_->GetTextInputClient()))
+ if (shared_input_method_ || !host_->GetTextInputClient())
host_->SetFocusedTextInputClient(this);
// TODO(yusukes): We don't need to call OnTextInputTypeChanged() once we move
@@ -55,8 +54,6 @@ void InputMethodBridge::OnBlur() {
bool InputMethodBridge::OnUntranslatedIMEMessage(const base::NativeEvent& event,
NativeEventResult* result) {
- if (!IsWidgetActive())
- return false;
return host_->OnUntranslatedIMEMessage(event, result);
}
@@ -85,8 +82,7 @@ void InputMethodBridge::CancelComposition(View* view) {
}
void InputMethodBridge::OnInputLocaleChanged() {
- if (IsWidgetActive())
- host_->OnInputLocaleChanged();
+ return host_->OnInputLocaleChanged();
Seigo Nonaka 2013/09/15 03:22:59 nit: You are returning void value, Is this intende
yukawa 2013/09/15 05:07:28 Yeah, the previous code had this 'return' unnecess
}
std::string InputMethodBridge::GetInputLocale() {
@@ -256,4 +252,5 @@ ui::InputMethod* InputMethodBridge::GetHostInputMethod() const {
return host_;
}
+
Seigo Nonaka 2013/09/15 03:22:59 nit: plz remove
} // namespace views
« no previous file with comments | « ui/views/ime/input_method_base.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698