Index: ash/screen_util_unittest.cc |
diff --git a/ash/screen_util_unittest.cc b/ash/screen_util_unittest.cc |
index 70905558d9bd6c7bc4996312bc269b6d5ba4c2a8..efbd30bccc6e4768cbde7c62991306d41c3bd753 100644 |
--- a/ash/screen_util_unittest.cc |
+++ b/ash/screen_util_unittest.cc |
@@ -6,6 +6,7 @@ |
#include "ash/common/wm/wm_screen_util.h" |
#include "ash/common/wm_lookup.h" |
+#include "ash/common/wm_shell.h" |
#include "ash/common/wm_window.h" |
#include "ash/shell.h" |
#include "ash/test/ash_test_base.h" |
@@ -105,6 +106,10 @@ TEST_F(ScreenUtilTest, ConvertRect) { |
} |
TEST_F(ScreenUtilTest, ShelfDisplayBoundsInUnifiedDesktop) { |
+ // TODO: requires unified desktop mode. http://crbug.com/581462. |
+ if (WmShell::Get()->IsRunningInMash()) |
+ return; |
+ |
display_manager()->SetUnifiedDesktopEnabled(true); |
views::Widget* widget = views::Widget::CreateWindowWithContextAndBounds( |