mash: Move wm_shelf_types.h into shelf_types.h

ash/common/shelf/shelf_types.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_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 {
 
-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,
 
   // Never auto-hide.
   SHELF_AUTO_HIDE_BEHAVIOR_NEVER,
 
   // Always hide.
   SHELF_AUTO_HIDE_ALWAYS_HIDDEN,
 };
 
 enum ShelfAutoHideState {
   SHELF_AUTO_HIDE_SHOWN,
   SHELF_AUTO_HIDE_HIDDEN,
 };
 
 enum ShelfVisibilityState {
   // Always visible.
   SHELF_VISIBLE,
 
   // A couple of pixels are reserved at the bottom for the shelf.
   SHELF_AUTO_HIDE,
 
   // Nothing is shown. Used for fullscreen windows.
   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_