| Index: ui/views/controls/label_unittest.cc
|
| diff --git a/ui/views/controls/label_unittest.cc b/ui/views/controls/label_unittest.cc
|
| index 0a3f4658761c1ac9662b0ce493e95ee1d3d27924..6322f1963b33694c42e3cf3feaf9cb65b59e2e15 100644
|
| --- a/ui/views/controls/label_unittest.cc
|
| +++ b/ui/views/controls/label_unittest.cc
|
| @@ -97,12 +97,6 @@ class LabelTest : public ViewsTestBase {
|
| .origin();
|
| }
|
|
|
| - base::string16 GetSelectedText() {
|
| - const gfx::RenderText* render_text =
|
| - label()->GetRenderTextForSelectionController();
|
| - return render_text->GetTextFromRange(render_text->selection());
|
| - }
|
| -
|
| private:
|
| Label* label_ = nullptr;
|
| Widget widget_;
|
| @@ -843,25 +837,25 @@ TEST_F(LabelTest, DoubleTripleClick) {
|
| ASSERT_TRUE(label()->SetSelectable(true));
|
|
|
| PerformClick(gfx::Point());
|
| - EXPECT_TRUE(GetSelectedText().empty());
|
| + EXPECT_TRUE(label()->GetSelectedText().empty());
|
|
|
| // Double clicking should select the word under cursor.
|
| PerformClick(gfx::Point(), ui::EF_IS_DOUBLE_CLICK);
|
| - EXPECT_STR_EQ("Label", GetSelectedText());
|
| + EXPECT_STR_EQ("Label", label()->GetSelectedText());
|
|
|
| // Triple clicking should select all the text.
|
| PerformClick(gfx::Point());
|
| - EXPECT_EQ(label()->text(), GetSelectedText());
|
| + EXPECT_EQ(label()->text(), label()->GetSelectedText());
|
|
|
| // Clicking again should alternate to double click.
|
| PerformClick(gfx::Point());
|
| - EXPECT_STR_EQ("Label", GetSelectedText());
|
| + EXPECT_STR_EQ("Label", label()->GetSelectedText());
|
|
|
| // Clicking at another location should clear the selection.
|
| PerformClick(GetCursorPoint(8));
|
| - EXPECT_TRUE(GetSelectedText().empty());
|
| + EXPECT_TRUE(label()->GetSelectedText().empty());
|
| PerformClick(GetCursorPoint(8), ui::EF_IS_DOUBLE_CLICK);
|
| - EXPECT_STR_EQ("double", GetSelectedText());
|
| + EXPECT_STR_EQ("double", label()->GetSelectedText());
|
| }
|
|
|
| // Verify label text selection behavior on mouse drag.
|
| @@ -872,14 +866,14 @@ TEST_F(LabelTest, MouseDrag) {
|
|
|
| PerformMousePress(GetCursorPoint(5));
|
| PerformMouseDragTo(gfx::Point());
|
| - EXPECT_STR_EQ("Label", GetSelectedText());
|
| + EXPECT_STR_EQ("Label", label()->GetSelectedText());
|
|
|
| PerformMouseDragTo(GetCursorPoint(8));
|
| - EXPECT_STR_EQ(" mo", GetSelectedText());
|
| + EXPECT_STR_EQ(" mo", label()->GetSelectedText());
|
|
|
| PerformMouseDragTo(gfx::Point(200, 0));
|
| PerformMouseRelease(gfx::Point(200, 0));
|
| - EXPECT_STR_EQ(" mouse drag", GetSelectedText());
|
| + EXPECT_STR_EQ(" mouse drag", label()->GetSelectedText());
|
| }
|
|
|
| // Verify the initially selected word on a double click, remains selected on
|
| @@ -891,14 +885,14 @@ TEST_F(LabelTest, MouseDragWord) {
|
|
|
| PerformClick(GetCursorPoint(8));
|
| PerformMousePress(GetCursorPoint(8), ui::EF_IS_DOUBLE_CLICK);
|
| - EXPECT_STR_EQ("drag", GetSelectedText());
|
| + EXPECT_STR_EQ("drag", label()->GetSelectedText());
|
|
|
| PerformMouseDragTo(gfx::Point());
|
| - EXPECT_STR_EQ("Label drag", GetSelectedText());
|
| + EXPECT_STR_EQ("Label drag", label()->GetSelectedText());
|
|
|
| PerformMouseDragTo(gfx::Point(200, 0));
|
| PerformMouseRelease(gfx::Point(200, 0));
|
| - EXPECT_STR_EQ("drag word", GetSelectedText());
|
| + EXPECT_STR_EQ("drag word", label()->GetSelectedText());
|
| }
|
| #endif // OS_MACOSX
|
|
|
| @@ -913,14 +907,14 @@ TEST_F(LabelTest, DISABLED_SelectionClipboard) {
|
| // Verify programmatic modification of selection, does not modify the
|
| // selection clipboard.
|
| label()->SelectRange(gfx::Range(2, 5));
|
| - EXPECT_STR_EQ("bel", GetSelectedText());
|
| + EXPECT_STR_EQ("bel", label()->GetSelectedText());
|
| EXPECT_TRUE(GetSelectionClipboardText().empty());
|
|
|
| // Verify text selection using the mouse updates the selection clipboard.
|
| PerformMousePress(GetCursorPoint(5));
|
| PerformMouseDragTo(gfx::Point());
|
| PerformMouseRelease(gfx::Point());
|
| - EXPECT_STR_EQ("Label", GetSelectedText());
|
| + EXPECT_STR_EQ("Label", label()->GetSelectedText());
|
| EXPECT_STR_EQ("Label", GetSelectionClipboardText());
|
| }
|
| #endif
|
|
|