mash: Move wm_shelf_types.h into shelf_types.h

ash/common/wm/shelf/wm_shelf_types.h

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
deleted file mode 100644
index eb6ff6275d546712b0058c3602306b345fa27b50..0000000000000000000000000000000000000000
--- a/ash/common/wm/shelf/wm_shelf_types.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2016 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_WM_SHELF_WM_SHELF_TYPES_H_
-#define 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 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_WM_SHELF_WM_SHELF_TYPES_H_