Moves ash/wm/common back into ash

ash/wm/common/wm_event.h

Index: ash/wm/common/wm_event.h
diff --git a/ash/wm/common/wm_event.h b/ash/wm/common/wm_event.h
index 3c901865d719445d68371cf50e7b945574c296f2..8f6b87c960177c846eebdbbb1934cf74efe25840 100644
--- a/ash/wm/common/wm_event.h
+++ b/ash/wm/common/wm_event.h
@@ -5,7 +5,7 @@
 #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"
@@ -91,7 +91,7 @@ enum WMEventType {
   WM_EVENT_WORKAREA_BOUNDS_CHANGED,
 };
 
-class ASH_WM_COMMON_EXPORT WMEvent {
+class ASH_EXPORT WMEvent {
  public:
   explicit WMEvent(WMEventType type);
   virtual ~WMEvent();
@@ -104,7 +104,7 @@ class ASH_WM_COMMON_EXPORT 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;