Moves ash/wm/common back into ash

ash/wm/common/wm_screen_util.h

 // 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_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;
 }
 
 namespace ash {
 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
 
 #endif  // ASH_WM_COMMON_WM_SCREEN_UTIL_H_