summaryrefslogtreecommitdiffstats
path: root/ash/shell_unittest.cc
diff options
context:
space:
mode:
authoroshima <oshima@chromium.org>2015-05-02 01:43:32 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-02 08:44:13 +0000
commit96f6a50247690d1058b1c08af2b871611c893326 (patch)
tree65d3ca8567a711eb31e06e7f7b83579737b24285 /ash/shell_unittest.cc
parent24185c2b385071c1ba007b3cc16f52692dd78d02 (diff)
downloadchromium_src-96f6a50247690d1058b1c08af2b871611c893326.zip
chromium_src-96f6a50247690d1058b1c08af2b871611c893326.tar.gz
chromium_src-96f6a50247690d1058b1c08af2b871611c893326.tar.bz2
Layout login/lock screen, shelf, app list, notifications inside the first display in Unified Desktop mode
Remove obsolete command line flag. BUG=365662 TEST=ShelfLayoutManagerTest.ShelfLayoutInUnifiedDesktop, ScreenUtilTest.ShelfDisplayBoundsInUnifiedDesktop Review URL: https://codereview.chromium.org/1116313002 Cr-Commit-Position: refs/heads/master@{#328060}
Diffstat (limited to 'ash/shell_unittest.cc')
-rw-r--r--ash/shell_unittest.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc
index b0f6b26..f74fdb0 100644
--- a/ash/shell_unittest.cc
+++ b/ash/shell_unittest.cc
@@ -374,6 +374,9 @@ TEST_F(ShellTest, LockScreenClosesActiveMenu) {
}
TEST_F(ShellTest, ManagedWindowModeBasics) {
+ if (!SupportsHostWindowResize())
+ return;
+
// We start with the usual window containers.
ExpectAllContainers();
// Shelf is visible.