Cleanup enums for shelf

ash/shelf_types.h

Index: ash/shelf_types.h
diff --git a/ash/wm/shelf_types.h b/ash/shelf_types.h
similarity index 54%
rename from ash/wm/shelf_types.h
rename to ash/shelf_types.h
index 7d94b29a66b2075ea47f2791097336b94de6c832..4286f07a7d995c284b78df938bed7db9e4537be7 100644
--- a/ash/wm/shelf_types.h
+++ b/ash/shelf_types.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_WM_SHELF_TYPES_H_
-#define ASH_WM_SHELF_TYPES_H_
+#ifndef ASH_SHELF_TYPES_H_
+#define ASH_SHELF_TYPES_H_
 
 namespace ash {
 
@@ -21,6 +21,22 @@ enum ShelfAutoHideBehavior {
   SHELF_AUTO_HIDE_BEHAVIOR_NEVER,
 };
 
+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 ShelfAutoHideState {
+  SHELF_AUTO_HIDE_SHOWN,
+  SHELF_AUTO_HIDE_HIDDEN,
+};
+
 }  // namespace ash
 
-#endif  // ASH_WM_SHELF_TYPES_H_
+#endif  // ASH_SHELF_TYPES_H_