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

Unified Diff: ui/touch_selection/touch_selection_controller_unittest.cc

Issue 2230413002: Remove unnecessary |show_on_tap_for_empty_editable| flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 | « ui/touch_selection/touch_selection_controller.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/touch_selection/touch_selection_controller_unittest.cc
diff --git a/ui/touch_selection/touch_selection_controller_unittest.cc b/ui/touch_selection/touch_selection_controller_unittest.cc
index 15bde06f9b9996e725c4b4d9a6c9a519835c493e..0ed38f686817033655a8ed007c67c1d2cf7519c7 100644
--- a/ui/touch_selection/touch_selection_controller_unittest.cc
+++ b/ui/touch_selection/touch_selection_controller_unittest.cc
@@ -106,12 +106,6 @@ class TouchSelectionControllerTest : public testing::Test,
return base::WrapUnique(new MockTouchHandleDrawable(&dragging_enabled_));
}
- void AllowShowingOnTapForEmptyEditable() {
- TouchSelectionController::Config config = DefaultConfig();
- config.show_on_tap_for_empty_editable = true;
- controller_.reset(new TouchSelectionController(this, config));
- }
-
void EnableLongPressDragSelection() {
TouchSelectionController::Config config = DefaultConfig();
config.enable_longpress_drag_selection = true;
@@ -214,14 +208,12 @@ class TouchSelectionControllerTest : public testing::Test,
private:
TouchSelectionController::Config DefaultConfig() {
- // Both |show_on_tap_for_empty_editable| and
- // |enable_longpress_drag_selection| are set to false by default, and should
+ // |enable_longpress_drag_selection| is set to false by default, and should
// be overriden for explicit testing.
TouchSelectionController::Config config;
config.max_tap_duration =
base::TimeDelta::FromMilliseconds(kDefaultTapTimeoutMs);
config.tap_slop = kDefaulTapSlop;
- config.show_on_tap_for_empty_editable = false;
config.enable_longpress_drag_selection = false;
return config;
}
@@ -301,8 +293,7 @@ TEST_F(TouchSelectionControllerTest, InsertionWithNoShowOnTapForEmptyEditable) {
bool visible = true;
controller().OnSelectionEditable(true);
- // Taps on an empty editable region should be ignored if the controller is
- // created with |show_on_tap_for_empty_editable| set to false.
+ // Taps on an empty editable region should be ignored
OnTapEvent();
controller().OnSelectionEmpty(true);
ChangeInsertion(insertion_rect, visible);
@@ -333,28 +324,6 @@ TEST_F(TouchSelectionControllerTest, InsertionWithNoShowOnTapForEmptyEditable) {
EXPECT_THAT(GetAndResetEvents(), ElementsAre(INSERTION_HANDLE_CLEARED));
}
-TEST_F(TouchSelectionControllerTest, InsertionWithShowOnTapForEmptyEditable) {
- AllowShowingOnTapForEmptyEditable();
-
- gfx::RectF insertion_rect(5, 5, 0, 10);
- bool visible = true;
- controller().OnSelectionEditable(true);
-
- // Taps on an empty editable region should show the insertion handle if the
- // controller is created with |show_on_tap_for_empty_editable| set to true.
- OnTapEvent();
- controller().OnSelectionEmpty(true);
- ChangeInsertion(insertion_rect, visible);
- EXPECT_THAT(GetAndResetEvents(),
- ElementsAre(SELECTION_ESTABLISHED, INSERTION_HANDLE_SHOWN));
- EXPECT_EQ(insertion_rect.bottom_left(), GetLastEventStart());
-
- // Additional taps should not hide the insertion handle in this case.
- OnTapEvent();
- ChangeInsertion(insertion_rect, visible);
- EXPECT_THAT(GetAndResetEvents(), IsEmpty());
-}
-
TEST_F(TouchSelectionControllerTest, InsertionAppearsAfterTapFollowingTyping) {
gfx::RectF insertion_rect(5, 5, 0, 10);
bool visible = true;
« no previous file with comments | « ui/touch_selection/touch_selection_controller.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698