Moves ash/wm/common back into ash

ash/wm/common/wm_event.h

 // Copyright 2014 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_EVENT_H_
 #define ASH_WM_COMMON_WM_EVENT_H_
 
-#include "ash/wm/common/ash_wm_common_export.h"
+#include "ash/ash_export.h"
 #include "ash/wm/common/wm_types.h"
 #include "base/macros.h"
 #include "ui/gfx/geometry/rect.h"
 
 // TODO(sky): move to common.
 namespace ash {
 namespace wm {
 
 // WMEventType defines a set of operations that can change the
 // window's state type and bounds.
@@ skipping 65 matching lines @@
   WM_EVENT_ADDED_TO_WORKSPACE,
 
   // Bounds of the display has changed.
   WM_EVENT_DISPLAY_BOUNDS_CHANGED,
 
   // Bounds of the work area has changed. This will not occur when the work
   // area has changed as a result of DISPLAY_BOUNDS_CHANGED.
   WM_EVENT_WORKAREA_BOUNDS_CHANGED,
 };
 
-class ASH_WM_COMMON_EXPORT WMEvent {
+class ASH_EXPORT WMEvent {
  public:
   explicit WMEvent(WMEventType type);
   virtual ~WMEvent();
 
   WMEventType type() const { return type_; }
 
  private:
   WMEventType type_;
   DISALLOW_COPY_AND_ASSIGN(WMEvent);
 };
 
 // An WMEvent to request new bounds for the window.
-class ASH_WM_COMMON_EXPORT SetBoundsEvent : public WMEvent {
+class ASH_EXPORT SetBoundsEvent : public WMEvent {
  public:
   SetBoundsEvent(WMEventType type, const gfx::Rect& requested_bounds);
   ~SetBoundsEvent() override;
 
   const gfx::Rect& requested_bounds() const { return requested_bounds_; }
 
  private:
   gfx::Rect requested_bounds_;
 
   DISALLOW_COPY_AND_ASSIGN(SetBoundsEvent);
 };
 
 }  // namespace wm
 }  // namespace ash
 
 #endif  // ASH_WM_COMMON_WM_EVENT_H_