mash: Move ash/common/wm/shelf to ash/common/shelf

ash/system/tray/tray_background_view.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_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_
 #define ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
+#include "ash/common/shelf/shelf_types.h"
 #include "ash/common/wm/background_animator.h"
-#include "ash/shelf/shelf_types.h"
 #include "ash/system/tray/actionable_view.h"
 #include "base/macros.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/views/bubble/tray_bubble_view.h"
 
 namespace ash {
 class ShelfLayoutManager;
 class StatusAreaWidget;
 class TrayEventFilter;
 class TrayBackground;
 
 // Base class for children of StatusAreaWidget: SystemTray, WebNotificationTray,
 // LogoutButtonTray, OverviewButtonTray.
 // This class handles setting and animating the background when the Launcher
 // his shown/hidden. It also inherits from ActionableView so that the tray
 // items can override PerformAction when clicked on.
 class ASH_EXPORT TrayBackgroundView : public ActionableView,
                                       public BackgroundAnimatorDelegate,
                                       public ui::ImplicitAnimationObserver {
  public:
   static const char kViewClassName[];
 
   // Base class for tray containers. Sets the border and layout. The container
   // auto-resizes the widget when necessary.
   class TrayContainer : public views::View {
    public:
-    explicit TrayContainer(wm::ShelfAlignment alignment);
+    explicit TrayContainer(ShelfAlignment alignment);
     ~TrayContainer() override {}
 
-    void SetAlignment(wm::ShelfAlignment alignment);
+    void SetAlignment(ShelfAlignment alignment);
 
     void set_size(const gfx::Size& size) { size_ = size; }
 
     // views::View:
     gfx::Size GetPreferredSize() const override;
 
    protected:
     // views::View:
     void ChildPreferredSizeChanged(views::View* child) override;
     void ChildVisibilityChanged(View* child) override;
     void ViewHierarchyChanged(
         const ViewHierarchyChangedDetails& details) override;
 
    private:
     void UpdateLayout();
 
-    wm::ShelfAlignment alignment_;
+    ShelfAlignment alignment_;
     gfx::Size size_;
 
     DISALLOW_COPY_AND_ASSIGN(TrayContainer);
   };
 
   explicit TrayBackgroundView(StatusAreaWidget* status_area_widget);
   ~TrayBackgroundView() override;
 
   // Called after the tray has been added to the widget containing it.
   virtual void Initialize();
@@ skipping 12 matching lines @@
 
   // ActionableView:
   bool PerformAction(const ui::Event& event) override;
   gfx::Rect GetFocusBounds() override;
   void OnGestureEvent(ui::GestureEvent* event) override;
 
   // BackgroundAnimatorDelegate:
   void UpdateBackground(int alpha) override;
 
   // Called whenever the shelf alignment changes.
-  virtual void SetShelfAlignment(wm::ShelfAlignment alignment);
+  virtual void SetShelfAlignment(ShelfAlignment alignment);
 
   // Called when the anchor (tray or bubble) may have moved or changed.
   virtual void AnchorUpdated() {}
 
   // Called from GetAccessibleState, must return a valid accessible name.
   virtual base::string16 GetAccessibleNameForTray() = 0;
 
   // Called when the bubble is resized.
   virtual void BubbleResized(const views::TrayBubbleView* bubble_view) {}
 
@@ skipping 34 matching lines @@
   // Returns true when the the background was overridden to be drawn as active.
   bool draw_background_as_active() const {return draw_background_as_active_; }
 
   StatusAreaWidget* status_area_widget() {
     return status_area_widget_;
   }
   const StatusAreaWidget* status_area_widget() const {
     return status_area_widget_;
   }
   TrayContainer* tray_container() const { return tray_container_; }
-  wm::ShelfAlignment shelf_alignment() const { return shelf_alignment_; }
+  ShelfAlignment shelf_alignment() const { return shelf_alignment_; }
   TrayEventFilter* tray_event_filter() { return tray_event_filter_.get(); }
 
   ShelfLayoutManager* GetShelfLayoutManager();
 
   // Updates the arrow visibility based on the launcher visibility.
   void UpdateBubbleViewArrow(views::TrayBubbleView* bubble_view);
 
  private:
   class TrayWidgetObserver;
 
   // Called from Initialize after all status area trays have been created.
   // Sets the border based on the position of the view.
   void SetTrayBorder();
 
   // ui::ImplicitAnimationObserver:
   void OnImplicitAnimationsCompleted() override;
   bool RequiresNotificationWhenAnimatorDestroyed() const override;
 
   // Applies transformations to the |layer()| to animate the view when
   // SetVisible(false) is called.
   void HideTransformation();
 
   // Unowned pointer to parent widget.
   StatusAreaWidget* status_area_widget_;
 
   // Convenience pointer to the contents view.
   TrayContainer* tray_container_;
 
   // Shelf alignment.
-  wm::ShelfAlignment shelf_alignment_;
+  ShelfAlignment shelf_alignment_;
 
   // Owned by the view passed to SetContents().
   TrayBackground* background_;
 
   // Animators for the background. They are only used for the old shelf layout.
   BackgroundAnimator hide_background_animator_;
   BackgroundAnimator hover_background_animator_;
 
   // True if the background gets hovered.
   bool hovered_;
 
   // This variable stores the activation override which will tint the background
   // differently if set to true.
   bool draw_background_as_active_;
 
   std::unique_ptr<TrayWidgetObserver> widget_observer_;
   std::unique_ptr<TrayEventFilter> tray_event_filter_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_