mash: Move wm_shelf_types.h into shelf_types.h

ash/common/shelf/shelf_types.h

Index: ash/common/shelf/shelf_types.h
diff --git a/ash/common/shelf/shelf_types.h b/ash/common/shelf/shelf_types.h
index 5ee6818e956f2c6575f3292210789c829c6630d2..9b0ac9e3214eb76ce76b04fcfb38dfc74d4797d1 100644
--- a/ash/common/shelf/shelf_types.h
+++ b/ash/common/shelf/shelf_types.h
@@ -5,11 +5,18 @@
 #ifndef ASH_COMMON_SHELF_SHELF_TYPES_H_
 #define ASH_COMMON_SHELF_SHELF_TYPES_H_
 
-// TODO(sky): make callers explicitly include this.
-#include "ash/common/wm/shelf/wm_shelf_types.h"
-
 namespace ash {
 
+enum ShelfAlignment {
+  SHELF_ALIGNMENT_BOTTOM,
+  SHELF_ALIGNMENT_LEFT,
+  SHELF_ALIGNMENT_RIGHT,
+  // Top has never been supported.
+
+  // The locked alignment is set temporarily and not saved to preferences.
+  SHELF_ALIGNMENT_BOTTOM_LOCKED,
+};
+
 enum ShelfAutoHideBehavior {
   // Always auto-hide.
   SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS,
@@ -37,6 +44,17 @@ enum ShelfVisibilityState {
   SHELF_HIDDEN,
 };
 
+enum ShelfBackgroundType {
+  // The default transparent background.
+  SHELF_BACKGROUND_DEFAULT,
+
+  // The background when a window is overlapping.
+  SHELF_BACKGROUND_OVERLAP,
+
+  // The background when a window is maximized.
+  SHELF_BACKGROUND_MAXIMIZED,
+};
+
 }  // namespace ash
 
 #endif  // ASH_COMMON_SHELF_SHELF_TYPES_H_