Cleanup enums for shelf

ash/launcher/launcher_tooltip_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/launcher/launcher_tooltip_manager.h"
 
 #include "ash/launcher/launcher_view.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/session_state_controller.h"
@@ skipping 307 matching lines @@
   if (event == SessionStateObserver::EVENT_PRELOCK_ANIMATION_STARTED ||
       event == SessionStateObserver::EVENT_LOCK_ANIMATION_STARTED)
     Close();
 }
 
 void LauncherTooltipManager::WillDeleteShelf() {
   shelf_layout_manager_ = NULL;
 }
 
 void LauncherTooltipManager::WillChangeVisibilityState(
-    ShelfLayoutManager::VisibilityState new_state) {
-  if (new_state == ShelfLayoutManager::HIDDEN) {
+    ShelfVisibilityState new_state) {
+  if (new_state == SHELF_HIDDEN) {
     StopTimer();
     Close();
   }
 }
 
 void LauncherTooltipManager::OnAutoHideStateChanged(
-    ShelfLayoutManager::AutoHideState new_state) {
-  if (new_state == ShelfLayoutManager::AUTO_HIDE_HIDDEN) {
+    ShelfAutoHideState new_state) {
+  if (new_state == SHELF_AUTO_HIDE_HIDDEN) {
     StopTimer();
     // AutoHide state change happens during an event filter, so immediate close
     // may cause a crash in the HandleMouseEvent() after the filter.  So we just
     // schedule the Close here.
     CloseSoon();
   }
 }
 
 void LauncherTooltipManager::CancelHidingAnimation() {
   if (!widget_ || !widget_->GetNativeView())
@@ skipping 30 matching lines @@
 
   gfx::NativeView native_view = widget_->GetNativeView();
   views::corewm::SetWindowVisibilityAnimationType(
       native_view, views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_VERTICAL);
   views::corewm::SetWindowVisibilityAnimationTransition(
       native_view, views::corewm::ANIMATE_HIDE);
 }
 
 }  // namespace internal
 }  // namespace ash