Moves ash/wm/common back into ash

ash/wm/common/wm_screen_util.h

Index: ash/wm/common/wm_screen_util.h
diff --git a/ash/wm/common/wm_screen_util.h b/ash/wm/common/wm_screen_util.h
index ef93fb48fa815ae1f56039ad4c2509e83e7b20c4..e016b5b043cb02f6c2c0a6f09f937f958af79781 100644
--- a/ash/wm/common/wm_screen_util.h
+++ b/ash/wm/common/wm_screen_util.h
@@ -5,7 +5,7 @@
 #ifndef ASH_WM_COMMON_WM_SCREEN_UTIL_H_
 #define ASH_WM_COMMON_WM_SCREEN_UTIL_H_
 
-#include "ash/wm/common/ash_wm_common_export.h"
+#include "ash/ash_export.h"
 
 namespace gfx {
 class Rect;
@@ -16,12 +16,10 @@ namespace wm {
 
 class WmWindow;
 
-ASH_WM_COMMON_EXPORT gfx::Rect GetDisplayWorkAreaBoundsInParent(
-    WmWindow* window);
-ASH_WM_COMMON_EXPORT gfx::Rect GetDisplayWorkAreaBounds(WmWindow* window);
-ASH_WM_COMMON_EXPORT gfx::Rect GetDisplayBoundsInParent(WmWindow* window);
-ASH_WM_COMMON_EXPORT gfx::Rect GetMaximizedWindowBoundsInParent(
-    WmWindow* window);
+ASH_EXPORT gfx::Rect GetDisplayWorkAreaBoundsInParent(WmWindow* window);
+ASH_EXPORT gfx::Rect GetDisplayWorkAreaBounds(WmWindow* window);
+ASH_EXPORT gfx::Rect GetDisplayBoundsInParent(WmWindow* window);
+ASH_EXPORT gfx::Rect GetMaximizedWindowBoundsInParent(WmWindow* window);
 
 }  // namespace wm
 }  // namespace ash