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

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

Issue 2488393003: Changes views_aura_mus_unittests to create DesktopNativeWidgetAura (Closed)
Patch Set: remove this and fix mac Created 4 years, 1 month 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/views/accessible_pane_view_unittest.cc ('k') | ui/views/controls/menu/menu_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 c0fb1c320f7b8145898c57fdaf93db53b75bfc5d..573fca0f99dcaa8c74783f15c16219d2ccb781b7 100644
--- a/ui/views/controls/button/menu_button_unittest.cc
+++ b/ui/views/controls/button/menu_button_unittest.cc
@@ -345,6 +345,13 @@ TEST_F(MenuButtonTest, ButtonStateForMenuButtonsWithPressedLocks) {
// 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())
+ return;
+
CreateMenuButtonWithNoListener();
// Move the mouse over the button; the button should be in a hovered state.
@@ -537,6 +544,10 @@ TEST_F(MenuButtonTest, DraggableMenuButtonDoesNotActivateOnDrag) {
// https://crbug.com/614037.
if (IsMus())
return;
+ // TODO: test uses GetContext(), which is not applicable to aura-mus.
+ // http://crbug.com/663809.
+ if (IsAuraMusClient())
+ return;
TestMenuButtonListener menu_button_listener;
CreateMenuButtonWithMenuButtonListener(&menu_button_listener);
TestDragController drag_controller;
@@ -563,6 +574,11 @@ TEST_F(MenuButtonTest, ActivateDropDownOnGestureTap) {
// 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())
+ return;
TestMenuButtonListener menu_button_listener;
CreateMenuButtonWithMenuButtonListener(&menu_button_listener);
« no previous file with comments | « ui/views/accessible_pane_view_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