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

Unified Diff: chrome/browser/chromeos/input_method/textinput_test_helper.cc

Issue 24012002: Move Range code to gfx. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: d 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
Index: chrome/browser/chromeos/input_method/textinput_test_helper.cc
diff --git a/chrome/browser/chromeos/input_method/textinput_test_helper.cc b/chrome/browser/chromeos/input_method/textinput_test_helper.cc
index e7bc859c0ac1964d3e4ade75702fe42b67029c36..e14e7849ddd53ca45433ac939b189bc484c923ad 100644
--- a/chrome/browser/chromeos/input_method/textinput_test_helper.cc
+++ b/chrome/browser/chromeos/input_method/textinput_test_helper.cc
@@ -33,7 +33,7 @@ void TextInputTestBase::SetUpInProcessBrowserTestFixture() {
TextInputTestHelper::TextInputTestHelper()
: waiting_type_(NO_WAIT),
- selection_range_(ui::Range::InvalidRange()),
+ selection_range_(gfx::Range::InvalidRange()),
focus_state_(false),
latest_text_input_type_(ui::TEXT_INPUT_TYPE_NONE) {
GetInputMethod()->AddObserver(this);
@@ -55,7 +55,7 @@ gfx::Rect TextInputTestHelper::GetCompositionHead() const {
return composition_head_;
}
-ui::Range TextInputTestHelper::GetSelectionRange() const {
+gfx::Range TextInputTestHelper::GetSelectionRange() const {
return selection_range_;
}
@@ -100,7 +100,7 @@ void TextInputTestHelper::OnUntranslatedIMEMessage(
void TextInputTestHelper::OnCaretBoundsChanged(
const ui::TextInputClient* client) {
- ui::Range text_range;
+ gfx::Range text_range;
if (!GetTextInputClient()->GetTextRange(&text_range) ||
!GetTextInputClient()->GetTextFromRange(text_range, &surrounding_text_) ||
!GetTextInputClient()->GetSelectionRange(&selection_range_))
@@ -153,7 +153,7 @@ void TextInputTestHelper::WaitForCaretBoundsChanged(
void TextInputTestHelper::WaitForSurroundingTextChanged(
const string16& expected_text,
- const ui::Range& expected_selection) {
+ const gfx::Range& expected_selection) {
waiting_type_ = WAIT_ON_CARET_BOUNDS_CHANGED;
while (expected_text != surrounding_text_ ||
expected_selection != selection_range_)
« no previous file with comments | « chrome/browser/chromeos/input_method/textinput_test_helper.h ('k') | chrome/browser/chromeos/ui/echo_dialog_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698