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

Unified Diff: ui/views/controls/button/menu_button_unittest.cc

Issue 2611773002: Removes code using mus client lib (Closed)
Patch Set: dont run on linux Created 3 years, 12 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: ui/views/controls/button/menu_button_unittest.cc
diff --git a/ui/views/controls/button/menu_button_unittest.cc b/ui/views/controls/button/menu_button_unittest.cc
index fe43c7a395194f437eeda560f889531375bb3d97..adb1a6d3d5fcf475fde5ee011bbbfcceba0b72c6 100644
--- a/ui/views/controls/button/menu_button_unittest.cc
+++ b/ui/views/controls/button/menu_button_unittest.cc
@@ -342,15 +342,10 @@ TEST_F(MenuButtonTest, ActivateDropDownOnMouseClick) {
// Test that the MenuButton stays pressed while there are any PressedLocks.
TEST_F(MenuButtonTest, ButtonStateForMenuButtonsWithPressedLocks) {
- // Hovered-state is not updated under mus when EventGenerator send a
- // mouse-move event. https://crbug.com/615033
- if (IsMus())
- return;
-
// Similarly for aura-mus-client the location of the cursor is not updated by
// EventGenerator so that IsMouseHovered() checks the wrong thing.
// https://crbug.com/615033.
- if (IsAuraMusClient())
+ if (IsMus())
return;
CreateMenuButtonWithNoListener();
@@ -541,13 +536,9 @@ TEST_F(MenuButtonTest,
// Tests that the MenuButton does not become pressed if it can be dragged, and a
// DragDropClient is processing the events.
TEST_F(MenuButtonTest, DraggableMenuButtonDoesNotActivateOnDrag) {
- // The test uses drag-n-drop, which isn't yet supported on mus.
- // https://crbug.com/614037.
- if (IsMus())
- return;
// TODO: test uses GetContext(), which is not applicable to aura-mus.
// http://crbug.com/663809.
- if (IsAuraMusClient())
+ if (IsMus())
return;
TestMenuButtonListener menu_button_listener;
CreateMenuButtonWithMenuButtonListener(&menu_button_listener);
@@ -571,14 +562,10 @@ TEST_F(MenuButtonTest, DraggableMenuButtonDoesNotActivateOnDrag) {
// Tests if the listener is notified correctly when a gesture tap happens on a
// MenuButton that has a MenuButtonListener.
TEST_F(MenuButtonTest, ActivateDropDownOnGestureTap) {
- // Hovered-state is not updated under mus when EventGenerator send a
- // mouse-move event. https://crbug.com/615033
- if (IsMus())
- return;
// Similarly for aura-mus-client the location of the cursor is not updated by
// EventGenerator so that IsMouseHovered() checks the wrong thing.
// https://crbug.com/615033.
- if (IsAuraMusClient())
+ if (IsMus())
return;
TestMenuButtonListener menu_button_listener;
CreateMenuButtonWithMenuButtonListener(&menu_button_listener);
« no previous file with comments | « ui/views/controls/button/custom_button_unittest.cc ('k') | ui/views/controls/menu/menu_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698