From ef80e4308a8960d1965e539dc60e1505133ca677 Mon Sep 17 00:00:00 2001 From: "oshima@chromium.org" Date: Tue, 4 Dec 2012 19:37:31 +0000 Subject: 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 --- ash/shell_unittest.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ash/shell_unittest.cc') 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. -- cgit v1.1