summaryrefslogtreecommitdiffstats
path: root/ash/shell_unittest.cc
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-21 05:34:40 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-21 05:34:40 +0000
commit27f6af6d0acc3fb17eb46b9b6e237d6468467d8a (patch)
treeded1351abc471445d06ba49f72bffd59dc52c3e9 /ash/shell_unittest.cc
parentf0e524cb492503bd20513e11bd379df98c97bb3a (diff)
downloadchromium_src-27f6af6d0acc3fb17eb46b9b6e237d6468467d8a.zip
chromium_src-27f6af6d0acc3fb17eb46b9b6e237d6468467d8a.tar.gz
chromium_src-27f6af6d0acc3fb17eb46b9b6e237d6468467d8a.tar.bz2
Makes the launcher auto-hide for maximized windows. This turned out to
be a bit icky for a handful of reasons. In particular it means the work area changes after going maximized so that you can't assume maximized windows get the work area bounds. This makes for some ordering dependencies. I've had to expose the bounds for maximized windows (and non-maximized windows). The code feels a bit messy in a number of places right now. In particular there a handful of places (in testing code) mucking with work area insets. We don't want that as it generally doesn't do the right thing anymore. BUG=116070 118671 TEST=covered by tests, but all see bugs. R=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/9764008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127904 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell_unittest.cc')
-rw-r--r--ash/shell_unittest.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc
index 7777ef0..9f5ff3a 100644
--- a/ash/shell_unittest.cc
+++ b/ash/shell_unittest.cc
@@ -336,15 +336,18 @@ TEST_F(ShellTest, FullscreenWindowHidesShelf) {
EXPECT_FALSE(widget->IsMaximized());
// Shelf defaults to visible.
- EXPECT_TRUE(Shell::GetInstance()->shelf()->visible());
+ EXPECT_EQ(internal::ShelfLayoutManager::VISIBLE,
+ Shell::GetInstance()->shelf()->visibility_state());
// Fullscreen window hides it.
widget->SetFullscreen(true);
- EXPECT_FALSE(Shell::GetInstance()->shelf()->visible());
+ EXPECT_EQ(internal::ShelfLayoutManager::HIDDEN,
+ Shell::GetInstance()->shelf()->visibility_state());
// Restoring the window restores it.
widget->Restore();
- EXPECT_TRUE(Shell::GetInstance()->shelf()->visible());
+ EXPECT_EQ(internal::ShelfLayoutManager::VISIBLE,
+ Shell::GetInstance()->shelf()->visibility_state());
// Clean up.
widget->Close();