Cleanup enums for shelf

ash/launcher/launcher_tooltip_manager.h

 // 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.
 
 #ifndef ASH_LAUNCHER_LAUNCHER_TOOLTIP_MANAGER_H_
 #define ASH_LAUNCHER_LAUNCHER_TOOLTIP_MANAGER_H_
 
 #include "ash/ash_export.h"
+#include "ash/shelf_types.h"
 #include "ash/wm/session_state_observer.h"
 #include "ash/wm/shelf_layout_manager.h"
-#include "ash/wm/shelf_types.h"
 #include "base/basictypes.h"
 #include "base/string16.h"
 #include "ui/base/events/event_handler.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/bubble/bubble_border.h"
 #include "ui/views/bubble/bubble_delegate.h"
 
 namespace base {
 class Timer;
 }
@@ skipping 55 matching lines @@
   virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
   virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
 
   // SessionStateObserver override:
   virtual void OnSessionStateEvent(SessionStateObserver::EventType event)
       OVERRIDE;
 
   // ShelfLayoutManager::Observer overrides:
   virtual void WillDeleteShelf() OVERRIDE;
   virtual void WillChangeVisibilityState(
-      ShelfLayoutManager::VisibilityState new_state) OVERRIDE;
-  virtual void OnAutoHideStateChanged(
-      ShelfLayoutManager::AutoHideState new_state) OVERRIDE;
+      ShelfVisibilityState new_state) OVERRIDE;
+  virtual void OnAutoHideStateChanged(ShelfAutoHideState new_state) OVERRIDE;
 
  private:
   class LauncherTooltipBubble;
   friend class test::LauncherViewTest;
   friend class test::LauncherTooltipManagerTest;
 
   void CancelHidingAnimation();
   void CloseSoon();
   void ShowInternal();
   void CreateBubble(views::View* anchor, const string16& text);
 
   LauncherTooltipBubble* view_;
   views::Widget* widget_;
   views::View* anchor_;
   string16 text_;
   ShelfAlignment alignment_;
   scoped_ptr<base::Timer> timer_;
 
   ShelfLayoutManager* shelf_layout_manager_;
   LauncherView* launcher_view_;
 
   DISALLOW_COPY_AND_ASSIGN(LauncherTooltipManager);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_LAUNCHER_LAUNCHER_TOOLTIP_MANAGER_H_