Moves ash/wm/common back into ash

ash/wm/common/window_positioner.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_WINDOW_POSITIONER_H_
 #define ASH_WM_COMMON_WINDOW_POSITIONER_H_
 
-#include "ash/wm/common/ash_wm_common_export.h"
+#include "ash/ash_export.h"
 #include "base/macros.h"
 #include "ui/base/ui_base_types.h"
 
 namespace display {
 class Display;
 }
 
 namespace gfx {
 class Rect;
 }
 
 namespace ash {
 namespace wm {
 class WmGlobals;
 class WmWindow;
 }
 
 namespace test {
 class WindowPositionerTest;
 }
 
 // WindowPositioner is used by the browser to move new popups automatically to
 // a usable position on the closest work area (of the active window).
-class ASH_WM_COMMON_EXPORT WindowPositioner {
+class ASH_EXPORT WindowPositioner {
  public:
   // When the screen resolution width is smaller then this size, The algorithm
   // will default to maximized.
   static int GetForceMaximizedWidthLimit();
 
   // The number of pixels which are kept free top, left and right when a window
   // gets positioned to its default location.
   static const int kDesktopBorderSize;
 
   // Maximum width of a window even if there is more room on the desktop.
@@ skipping 80 matching lines @@
   // The last used position.
   int last_popup_position_x_;
   int last_popup_position_y_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowPositioner);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_COMMON_WINDOW_POSITIONER_H_