diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-04 19:37:31 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-04 19:37:31 +0000 |
| commit | ef80e4308a8960d1965e539dc60e1505133ca677 (patch) | |
| tree | 5fb893ce5eb4c3482562615f5fb8015ab59c405a /ash/shell_unittest.cc | |
| parent | 5bb6f3c52b5946eaadb989734864a202c4e4ce8d (diff) | |
| download | chromium_src-ef80e4308a8960d1965e539dc60e1505133ca677.zip chromium_src-ef80e4308a8960d1965e539dc60e1505133ca677.tar.gz chromium_src-ef80e4308a8960d1965e539dc60e1505133ca677.tar.bz2 | |
Cleanup enums for shelf
- move enums from ShelfLayoutManager to shelf_types.h
- remove redundant VisibilityState
- added SHELF_ prefix to these state.
BUG=151417
TEST=none
Review URL: https://chromiumcodereview.appspot.com/11316323
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171024 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell_unittest.cc')
| -rw-r--r-- | ash/shell_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc index 6fbab6a..ec3c01d 100644 --- a/ash/shell_unittest.cc +++ b/ash/shell_unittest.cc @@ -318,19 +318,19 @@ TEST_F(ShellTest, FullscreenWindowHidesShelf) { // Shelf defaults to visible. EXPECT_EQ( - internal::ShelfLayoutManager::VISIBLE, + SHELF_VISIBLE, Shell::GetPrimaryRootWindowController()->shelf()->visibility_state()); // Fullscreen window hides it. widget->SetFullscreen(true); EXPECT_EQ( - internal::ShelfLayoutManager::HIDDEN, + SHELF_HIDDEN, Shell::GetPrimaryRootWindowController()->shelf()->visibility_state()); // Restoring the window restores it. widget->Restore(); EXPECT_EQ( - internal::ShelfLayoutManager::VISIBLE, + SHELF_VISIBLE, Shell::GetPrimaryRootWindowController()->shelf()->visibility_state()); // Clean up. |