| Index: ash/wm/window_cycle_controller_unittest.cc
|
| diff --git a/ash/wm/window_cycle_controller_unittest.cc b/ash/wm/window_cycle_controller_unittest.cc
|
| index 8504f887ac90dcb7202933b4b066c9e6e00f7b0c..d74909fa8e8b2efabf8c22ec43ae9c86bfeeb550 100644
|
| --- a/ash/wm/window_cycle_controller_unittest.cc
|
| +++ b/ash/wm/window_cycle_controller_unittest.cc
|
| @@ -480,6 +480,10 @@ TEST_F(WindowCycleControllerTest, MostRecentlyUsed) {
|
|
|
| // Tests that beginning window selection hides the app list.
|
| TEST_F(WindowCycleControllerTest, SelectingHidesAppList) {
|
| + // TODO: fails in mash because of AppListPresenter. http://crbug.com/696028.
|
| + if (WmShell::Get()->IsRunningInMash())
|
| + return;
|
| +
|
| // The tested behavior relies on the app list presenter implementation.
|
| test::TestAppListViewPresenterImpl app_list_presenter_impl;
|
|
|
| @@ -607,6 +611,10 @@ TEST_F(WindowCycleControllerTest, CycleMruPanelDestroyed) {
|
|
|
| // Tests that the tab key events are not sent to the window.
|
| TEST_F(WindowCycleControllerTest, TabKeyNotLeaked) {
|
| + // TODO: investigate failure in mash. http://crbug.com/698894.
|
| + if (WmShell::Get()->IsRunningInMash())
|
| + return;
|
| +
|
| std::unique_ptr<Window> w0(CreateTestWindowInShellWithId(0));
|
| std::unique_ptr<Window> w1(CreateTestWindowInShellWithId(1));
|
| EventCounter event_count;
|
| @@ -627,6 +635,10 @@ TEST_F(WindowCycleControllerTest, TabKeyNotLeaked) {
|
|
|
| // While the UI is active, mouse events are captured.
|
| TEST_F(WindowCycleControllerTest, MouseEventsCaptured) {
|
| + // TODO: investigate failure in mash. http://crbug.com/698894.
|
| + if (WmShell::Get()->IsRunningInMash())
|
| + return;
|
| +
|
| // This delegate allows the window to receive mouse events.
|
| aura::test::TestWindowDelegate delegate;
|
| std::unique_ptr<Window> w0(CreateTestWindowInShellWithDelegate(
|
| @@ -701,6 +713,10 @@ TEST_F(WindowCycleControllerTest, TabPastFullscreenWindow) {
|
| // Tests that the Alt+Tab UI's position isn't affected by the origin of the
|
| // display it's on. See crbug.com/675718
|
| TEST_F(WindowCycleControllerTest, MultiDisplayPositioning) {
|
| + // TODO: investigate failure in mash. http://crbug.com/698894.
|
| + if (WmShell::Get()->IsRunningInMash())
|
| + return;
|
| +
|
| int64_t primary_id = display::Screen::GetScreen()->GetPrimaryDisplay().id();
|
| display::DisplayIdList list =
|
| display::test::CreateDisplayIdListN(2, primary_id, primary_id + 1);
|
|
|