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

Unified Diff: ash/accelerators/accelerator_controller_unittest.cc

Issue 63783002: disable AcceleratorControllerTest.GlobalAcceleratorsToggleAppList on win aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/accelerator_controller_unittest.cc
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc
index 2f8b034f678200b6423b969b1abce9f1c46d4f79..e6934a26dab4fdc62ed1f5eeaea419506239b185 100644
--- a/ash/accelerators/accelerator_controller_unittest.cc
+++ b/ash/accelerators/accelerator_controller_unittest.cc
@@ -966,7 +966,15 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
#endif
}
-TEST_F(AcceleratorControllerTest, GlobalAcceleratorsToggleAppList) {
+#if defined(OS_WIN) && defined(USE_AURA)
+// Bug 316012.
+#define MAYBE_GlobalAcceleratorsToggleAppList \
+ DISABLED_GlobalAcceleratorsToggleAppList
+#else
+#define MAYBE_GlobalAcceleratorsToggleAppList GlobalAcceleratorsToggleAppList
+#endif
+
+TEST_F(AcceleratorControllerTest, MAYBE_GlobalAcceleratorsToggleAppList) {
AccessibilityDelegate* delegate =
ash::Shell::GetInstance()->accessibility_delegate();
EXPECT_FALSE(ash::Shell::GetInstance()->GetAppListTargetVisibility());
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698