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

Unified Diff: ash/system/overview/overview_button_tray_unittest.cc

Issue 2732573002: chromeos: moves more ash tests to run on mash (Closed)
Patch Set: fix bug ref 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
« no previous file with comments | « ash/sticky_keys/sticky_keys_overlay_unittest.cc ('k') | ash/system/toast/toast_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/overview/overview_button_tray_unittest.cc
diff --git a/ash/system/overview/overview_button_tray_unittest.cc b/ash/system/overview/overview_button_tray_unittest.cc
index 7f5b491d1576d8067289918ae373d0808141cc86..9aaf224c8e4d92a6a86d647b665789fa842d957c 100644
--- a/ash/system/overview/overview_button_tray_unittest.cc
+++ b/ash/system/overview/overview_button_tray_unittest.cc
@@ -47,7 +47,6 @@ OverviewButtonTray* GetSecondaryTray() {
} // namespace
-// TODO(jamescook): Migrate to //ash/common/system. http://crbug.com/620955
class OverviewButtonTrayTest : public test::AshTestBase {
public:
OverviewButtonTrayTest() {}
@@ -111,6 +110,10 @@ TEST_F(OverviewButtonTrayTest, PerformAction) {
// Tests that tapping on the control will record the user action Tray_Overview.
TEST_F(OverviewButtonTrayTest, TrayOverviewUserAction) {
+ // TODO: investigate failure in mash, http://crbug.com/698129.
+ if (WmShell::Get()->IsRunningInMash())
+ return;
+
ASSERT_FALSE(WmShell::Get()->window_selector_controller()->IsSelecting());
// Tapping on the control when there are no windows (and thus the user cannot
@@ -207,6 +210,11 @@ TEST_F(OverviewButtonTrayTest, ActiveStateOnlyDuringOverviewMode) {
// Test that when a hide animation is aborted via deletion, that the
// OverviewButton is still hidden.
TEST_F(OverviewButtonTrayTest, HideAnimationAlwaysCompletes) {
+ // TODO: disabled as ScreenRotationAnimator does not work in mash,
+ // http://crbug.com/696754.
+ if (WmShell::Get()->IsRunningInMash())
+ return;
+
WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
true);
« no previous file with comments | « ash/sticky_keys/sticky_keys_overlay_unittest.cc ('k') | ash/system/toast/toast_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698