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

ash/shelf/shelf_widget.h

Index: ash/shelf/shelf_widget.h
diff --git a/ash/shelf/shelf_widget.h b/ash/shelf/shelf_widget.h
index 6ea9ba147a9b5260847532a5bc7407c41177c998..95b72cead717eb2c2ae1ea551304ccadb716c461 100644
--- a/ash/shelf/shelf_widget.h
+++ b/ash/shelf/shelf_widget.h
@@ -8,9 +8,9 @@
 #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"
@@ -37,12 +37,12 @@ class ASH_EXPORT ShelfWidget : public views::Widget,
   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.