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

Unified Diff: ui/views/controls/menu/menu_controller_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/controls/button/menu_button_unittest.cc ('k') | ui/views/controls/menu/menu_runner_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/menu/menu_controller_unittest.cc
diff --git a/ui/views/controls/menu/menu_controller_unittest.cc b/ui/views/controls/menu/menu_controller_unittest.cc
index de6b7ba27072d0d416a3a04b8ed885fba04eddf0..406e309cae0cd1666854f8dfebfce01a36f5e02c 100644
--- a/ui/views/controls/menu/menu_controller_unittest.cc
+++ b/ui/views/controls/menu/menu_controller_unittest.cc
@@ -1426,6 +1426,10 @@ TEST_F(MenuControllerTest, RunWithoutWidgetDoesntCrash) {
// MenuController becomes active, that the exiting of drag does not cause a
// crash.
TEST_F(MenuControllerTest, MenuControllerReplacedDuringDrag) {
+ // TODO: this test wedges with aura-mus-client. http://crbug.com/664280.
+ if (IsAuraMusClient())
+ return;
+
// This test creates two native widgets, but expects the child native widget
// to be able to reach up and use the parent native widget's aura
// objects. https://crbug.com/614037
@@ -1445,6 +1449,10 @@ TEST_F(MenuControllerTest, MenuControllerReplacedDuringDrag) {
// destroy the MenuController. On Windows and Linux this destruction also
// destroys the Widget used for drag-and-drop, thereby ending the drag.
TEST_F(MenuControllerTest, CancelAllDuringDrag) {
+ // TODO: this test wedges with aura-mus-client. http://crbug.com/664280.
+ if (IsAuraMusClient())
+ return;
+
// This test creates two native widgets, but expects the child native widget
// to be able to reach up and use the parent native widget's aura
// objects. https://crbug.com/614037
« no previous file with comments | « ui/views/controls/button/menu_button_unittest.cc ('k') | ui/views/controls/menu/menu_runner_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698