| Index: ash/common/wm/shelf/wm_shelf_types.h
|
| diff --git a/ash/common/wm/shelf/wm_shelf_types.h b/ash/common/wm/shelf/wm_shelf_types.h
|
| index b6cdc13c0169b7e8b2a816a0d9f1c8fea77bade1..eb6ff6275d546712b0058c3602306b345fa27b50 100644
|
| --- a/ash/common/wm/shelf/wm_shelf_types.h
|
| +++ b/ash/common/wm/shelf/wm_shelf_types.h
|
| @@ -7,20 +7,6 @@
|
|
|
| namespace ash {
|
|
|
| -// TODO(sky): move into wm namespace.
|
| -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,
|
| -};
|
| -
|
| -namespace wm {
|
| -
|
| enum ShelfAlignment {
|
| SHELF_ALIGNMENT_BOTTOM,
|
| SHELF_ALIGNMENT_LEFT,
|
| @@ -42,7 +28,6 @@ enum ShelfBackgroundType {
|
| SHELF_BACKGROUND_MAXIMIZED,
|
| };
|
|
|
| -} // namespace wm
|
| } // namespace ash
|
|
|
| #endif // ASH_COMMON_WM_SHELF_WM_SHELF_TYPES_H_
|
|
|