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

Unified Diff: ash/sticky_keys/sticky_keys_overlay_unittest.cc

Issue 2732573002: chromeos: moves more ash tests to run on mash (Closed)
Patch Set: Created 3 years, 10 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: ash/sticky_keys/sticky_keys_overlay_unittest.cc
diff --git a/ash/sticky_keys/sticky_keys_overlay_unittest.cc b/ash/sticky_keys/sticky_keys_overlay_unittest.cc
index c6e2f5bccdcb3a555b9ed5816439fb71fd7b1151..ddede546736aaa4676eaa068280b64b44cd70439 100644
--- a/ash/sticky_keys/sticky_keys_overlay_unittest.cc
+++ b/ash/sticky_keys/sticky_keys_overlay_unittest.cc
@@ -56,6 +56,10 @@ TEST_F(StickyKeysOverlayTest, OverlayNotDestroyedAfterDisplayRemoved) {
display_manager()->GetCurrentDisplayIdList();
int64_t primary_display_id = display_ids[0];
int64_t secondary_display_id = display_ids[1];
+ // TODO: disabled as ScreenRotationAnimator does not work in mash,
+ // http://crbug.com/696754.
+ if (WmShell::Get()->IsRunningInMash())
+ return;
display_manager()->SetLayoutForCurrentDisplays(
display::test::CreateDisplayLayout(display_manager(),
display::DisplayPlacement::LEFT, 0));

Powered by Google App Engine
This is Rietveld 408576698