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

ash/shelf/shelf_widget.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_SHELF_SHELF_WIDGET_H_
 #define ASH_SHELF_SHELF_WIDGET_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_layout_manager_observer.h"
-#include "ash/shelf/shelf_types.h"
 #include "base/macros.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
 
 namespace ash {
 class FocusCycler;
 class Shelf;
 class ShelfLayoutManager;
 class StatusAreaWidget;
 class WmWindow;
 class WorkspaceController;
 
 class ASH_EXPORT ShelfWidget : public views::Widget,
                                public views::WidgetObserver,
                                public ShelfLayoutManagerObserver {
  public:
   ShelfWidget(WmWindow* wm_shelf_container,
               WmWindow* wm_status_container,
               WorkspaceController* workspace_controller);
   ~ShelfWidget() override;
 
   // Returns if shelf alignment option is enabled, and the user is able to
   // adjust the alignment (guest and supervised mode users cannot for example).
   static bool ShelfAlignmentAllowed();
 
   void OnShelfAlignmentChanged();
-  wm::ShelfAlignment GetAlignment() const;
+  ShelfAlignment GetAlignment() const;
 
   // Sets the shelf's background type.
-  void SetPaintsBackground(wm::ShelfBackgroundType background_type,
+  void SetPaintsBackground(ShelfBackgroundType background_type,
                            BackgroundAnimatorChangeType change_type);
-  wm::ShelfBackgroundType GetBackgroundType() const;
+  ShelfBackgroundType GetBackgroundType() const;
 
   // Hide the shelf behind a black bar during e.g. a user transition when |hide|
   // is true. The |animation_time_ms| will be used as animation duration.
   void HideShelfBehindBlackBar(bool hide, int animation_time_ms);
   bool IsShelfHiddenBehindBlackBar() const;
 
   // Causes shelf items to be slightly dimmed (e.g. when a window is maximized).
   void SetDimsShelf(bool dimming);
   bool GetDimsShelf() const;
 
@@ skipping 56 matching lines @@
   DelegateView* delegate_view_;
   BackgroundAnimator background_animator_;
   bool activating_as_fallback_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfWidget);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_WIDGET_H_