Moves ash/wm/common back into ash

ash/wm/common/wm_activation_observer.h

Index: ash/wm/common/wm_activation_observer.h
diff --git a/ash/wm/common/wm_activation_observer.h b/ash/wm/common/wm_activation_observer.h
index f5647f80790fc4cfbd3e5c245cb9c813d88bd8e7..6f1e33efb5a8b3944ce8c0d3929cf0dfd56c22eb 100644
--- a/ash/wm/common/wm_activation_observer.h
+++ b/ash/wm/common/wm_activation_observer.h
@@ -5,7 +5,7 @@
 #ifndef ASH_WM_COMMON_WM_ACTIVATION_OBSERVER_H_
 #define ASH_WM_COMMON_WM_ACTIVATION_OBSERVER_H_
 
-#include "ash/wm/common/ash_wm_common_export.h"
+#include "ash/ash_export.h"
 
 namespace ash {
 namespace wm {
@@ -13,7 +13,7 @@ namespace wm {
 class WmWindow;
 
 // Used to track changes in activation.
-class ASH_WM_COMMON_EXPORT WmActivationObserver {
+class ASH_EXPORT WmActivationObserver {
  public:
   virtual void OnWindowActivated(WmWindow* gained_active,
                                  WmWindow* lost_active) {}