Moves ash/wm/common back into ash

ash/wm/common/wm_types.h

 // Copyright 2013 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_WM_COMMON_WM_TYPES_H_
 #define ASH_WM_COMMON_WM_TYPES_H_
 
-#include "ash/wm/common/ash_wm_common_export.h"
+#include "ash/ash_export.h"
 #include "ui/base/ui_base_types.h"
 
 namespace ash {
 namespace wm {
 
 // This enum defines both common show state copied from
 // ui::WindowShowState as well as new states introduced in ash.
 // The separate enum is defined here because we don't want to leak
 // these type to ui/base until they're stable and we know for sure
 // that they'll persist over time.
@@ skipping 20 matching lines @@
 
   // A window is in this state when it is automatically placed and
   // sized by the window manager. (it's newly opened, or pushed to the side
   // due to new window, for example).
   WINDOW_STATE_TYPE_AUTO_POSITIONED,
 };
 
 // Utility functions to convert WindowStateType <-> ui::WindowShowState.
 // Note: LEFT/RIGHT MAXIMIZED, AUTO_POSITIONED type will be lost when
 // converting to ui::WindowShowState.
-ASH_WM_COMMON_EXPORT WindowStateType
-ToWindowStateType(ui::WindowShowState state);
-ASH_WM_COMMON_EXPORT ui::WindowShowState ToWindowShowState(
-    WindowStateType type);
+ASH_EXPORT WindowStateType ToWindowStateType(ui::WindowShowState state);
+ASH_EXPORT ui::WindowShowState ToWindowShowState(WindowStateType type);
 
 // Returns true if |type| is WINDOW_STATE_TYPE_MAXIMIZED or
 // WINDOW_STATE_TYPE_FULLSCREEN.
-ASH_WM_COMMON_EXPORT bool IsMaximizedOrFullscreenWindowStateType(
-    WindowStateType type);
+ASH_EXPORT bool IsMaximizedOrFullscreenWindowStateType(WindowStateType type);
 
 }  // namespace wm
 }  // namespace ash
 
 #endif  // ASH_WM_COMMON_WM_TYPES_H_