Moves ash/wm/common back into ash

ash/wm/common/wm_types.h

Index: ash/wm/common/wm_types.h
diff --git a/ash/wm/common/wm_types.h b/ash/wm/common/wm_types.h
index 9dd1cd261841a92556bf77bc88948226a0e994bc..5d85ae74d06f8ea2cc6b1a33dde0734ca71a631a 100644
--- a/ash/wm/common/wm_types.h
+++ b/ash/wm/common/wm_types.h
@@ -5,7 +5,7 @@
 #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 {
@@ -46,15 +46,12 @@ enum WindowStateType {
 // 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