Refactors DockedWindowLayoutManager in terms of ash/wm/common

ash/shelf/shelf_types.h

Index: ash/shelf/shelf_types.h
diff --git a/ash/shelf/shelf_types.h b/ash/shelf/shelf_types.h
index f74279f72d4ad069e8123153fb71c9698334e155..d3b6a9a41be26435a0d3b2c0b5237605a47536d0 100644
--- a/ash/shelf/shelf_types.h
+++ b/ash/shelf/shelf_types.h
@@ -5,17 +5,10 @@
 #ifndef ASH_SHELF_SHELF_TYPES_H_
 #define ASH_SHELF_SHELF_TYPES_H_
 
-namespace ash {
-
-enum ShelfAlignment {
-  SHELF_ALIGNMENT_BOTTOM,
-  SHELF_ALIGNMENT_LEFT,
-  SHELF_ALIGNMENT_RIGHT,
-  // Top has never been supported.
+// TODO(sky): make callers explicitly include this.
+#include "ash/wm/common/shelf/wm_shelf_types.h"
 
-  // The locked alignment is set temporarily and not saved to preferences.
-  SHELF_ALIGNMENT_BOTTOM_LOCKED,
-};
+namespace ash {
 
 enum ShelfAutoHideBehavior {
   // Always auto-hide.
@@ -44,17 +37,6 @@ enum ShelfAutoHideState {
   SHELF_AUTO_HIDE_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_SHELF_SHELF_TYPES_H_