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

Unified Diff: trunk/src/ui/views/ime/input_method_base.cc

Issue 23710009: Revert 219673 "Fix Views Combobox and Tree View text input." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 4 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 | « trunk/src/ui/views/ime/input_method_base.h ('k') | trunk/src/ui/views/ime/input_method_bridge.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ui/views/ime/input_method_base.cc
===================================================================
--- trunk/src/ui/views/ime/input_method_base.cc (revision 220120)
+++ trunk/src/ui/views/ime/input_method_base.cc (working copy)
@@ -43,7 +43,8 @@
void InputMethodBase::OnTextInputTypeChanged(View* view) {}
ui::TextInputClient* InputMethodBase::GetTextInputClient() const {
- return GetFocusedView() ? GetFocusedView()->GetTextInputClient() : NULL;
+ return (widget_ && widget_->IsActive() && GetFocusedView()) ?
+ GetFocusedView()->GetTextInputClient() : NULL;
}
ui::TextInputType InputMethodBase::GetTextInputType() const {
« no previous file with comments | « trunk/src/ui/views/ime/input_method_base.h ('k') | trunk/src/ui/views/ime/input_method_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698