Moves ash/wm/common back into ash

ash/wm/common/wm_layout_manager.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_LAYOUT_MANAGER_H_
 #define ASH_WM_COMMON_WM_LAYOUT_MANAGER_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;
 
 // Used to position the child WmWindows of a WmWindow. WmLayoutManager is called
 // at key points in a WmWindows life cycle thats allow sthe WmLayoutManager to
 // position or change child WmWindows.
-class ASH_WM_COMMON_EXPORT WmLayoutManager {
+class ASH_EXPORT WmLayoutManager {
  public:
   virtual ~WmLayoutManager() {}
 
   // Invoked when the window the WmLayoutManager is associated with is resized.
   virtual void OnWindowResized() = 0;
 
   // Invoked when a window is added to the window the WmLayoutManager is
   // associated with.
   virtual void OnWindowAddedToLayout(WmWindow* child) = 0;
 
@@ skipping 15 matching lines @@
   // request, including ignoring the request. Implementation must call
   // SetChildBoundsDirect() so that an infinite loop does not result.
   virtual void SetChildBounds(WmWindow* child,
                               const gfx::Rect& requested_bounds) = 0;
 };
 
 }  // namespace wm
 }  // namespace ash
 
 #endif  // ASH_WM_COMMON_WM_LAYOUT_MANAGER_H_