| Index: ash/wm/dock/docked_window_layout_manager_unittest.cc
|
| diff --git a/ash/wm/dock/docked_window_layout_manager_unittest.cc b/ash/wm/dock/docked_window_layout_manager_unittest.cc
|
| index 6fcd020ff895647b37cf6eac69c06a3aaa19e38d..d3426e759f2c28384cfacee3f0d12d61640cd95b 100644
|
| --- a/ash/wm/dock/docked_window_layout_manager_unittest.cc
|
| +++ b/ash/wm/dock/docked_window_layout_manager_unittest.cc
|
| @@ -10,6 +10,7 @@
|
| #include "ash/common/wm/panels/panel_layout_manager.h"
|
| #include "ash/common/wm/window_resizer.h"
|
| #include "ash/common/wm/window_state.h"
|
| +#include "ash/common/wm_shell.h"
|
| #include "ash/common/wm_window.h"
|
| #include "ash/public/cpp/shell_window_ids.h"
|
| #include "ash/root_window_controller.h"
|
| @@ -323,6 +324,10 @@ TEST_P(DockedWindowLayoutManagerTest, AutoPlacingRight) {
|
| // RearrangeVisibleWindowOnShow places windows flush with work area edges.
|
| // Test case for the secondary screen.
|
| TEST_P(DockedWindowLayoutManagerTest, AutoPlacingRightSecondScreen) {
|
| + // TODO: investigate failure in mash. http://crbug.com/698049.
|
| + if (WmShell::Get()->IsRunningInMash())
|
| + return;
|
| +
|
| // Create a dual screen layout.
|
| UpdateDisplay("600x600,600x600");
|
|
|
| @@ -496,6 +501,11 @@ TEST_P(DockedWindowLayoutManagerTest, ThreeWindowsDragging) {
|
|
|
| // Adds three windows in bottom display and tests layout after a drag.
|
| TEST_P(DockedWindowLayoutManagerTest, ThreeWindowsDraggingSecondScreen) {
|
| + // TODO: SetLayoutForCurrentDisplays() needs to ported to mash.
|
| + // http://crbug.com/698043.
|
| + if (WmShell::Get()->IsRunningInMash())
|
| + return;
|
| +
|
| // Create two screen vertical layout.
|
| UpdateDisplay("600x1000,600x1000");
|
| // Layout the secondary display to the bottom of the primary.
|
| @@ -770,6 +780,10 @@ TEST_P(DockedWindowLayoutManagerTest, TwoWindowsHeightRestrictions) {
|
| // Tests that a docked window is moved to primary display when secondary display
|
| // is disconnected and that it stays docked and properly positioned.
|
| TEST_P(DockedWindowLayoutManagerTest, DisplayDisconnectionMovesDocked) {
|
| + // TODO: investigate failure in mash. http://crbug.com/698049.
|
| + if (WmShell::Get()->IsRunningInMash())
|
| + return;
|
| +
|
| // Create a dual screen layout.
|
| UpdateDisplay("600x700,800x600");
|
|
|
|
|