Chromium Code Reviews| 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..c336802efff5ff2f2a75e6309af1647435311808 100644 |
| --- a/ash/system/overview/overview_button_tray_unittest.cc |
| +++ b/ash/system/overview/overview_button_tray_unittest.cc |
| @@ -111,6 +111,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/696754. |
|
msw
2017/03/03 01:08:10
q: Is this bug applicable to this failure too? (th
sky
2017/03/03 03:51:04
Indeed you are right. I filed a new bug for this.
|
| + 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 +211,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); |