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

Unified Diff: trunk/src/chrome/browser/chromeos/input_method/textinput_test_helper.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 | « no previous file | trunk/src/ui/views/controls/combobox/combobox.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/browser/chromeos/input_method/textinput_test_helper.cc
===================================================================
--- trunk/src/chrome/browser/chromeos/input_method/textinput_test_helper.cc (revision 220120)
+++ trunk/src/chrome/browser/chromeos/input_method/textinput_test_helper.cc (working copy)
@@ -73,8 +73,7 @@
void TextInputTestHelper::OnTextInputTypeChanged(
const ui::TextInputClient* client) {
- latest_text_input_type_ =
- client ? client->GetTextInputType() : ui::TEXT_INPUT_TYPE_NONE;
+ latest_text_input_type_ = client->GetTextInputType();
if (waiting_type_ == WAIT_ON_TEXT_INPUT_TYPE_CHANGED)
base::MessageLoop::current()->Quit();
}
@@ -102,8 +101,7 @@
void TextInputTestHelper::OnCaretBoundsChanged(
const ui::TextInputClient* client) {
ui::Range text_range;
- if (!GetTextInputClient() || GetTextInputClient() != client ||
- !GetTextInputClient()->GetTextRange(&text_range) ||
+ if (!GetTextInputClient()->GetTextRange(&text_range) ||
!GetTextInputClient()->GetTextFromRange(text_range, &surrounding_text_) ||
!GetTextInputClient()->GetSelectionRange(&selection_range_))
return;
« no previous file with comments | « no previous file | trunk/src/ui/views/controls/combobox/combobox.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698