Revert 259580 "Move wm/public into wm target"

trunk/src/ui/wm/public/activation_change_observer.h

Index: trunk/src/ui/wm/public/activation_change_observer.h
===================================================================
--- trunk/src/ui/wm/public/activation_change_observer.h	(revision 259588)
+++ trunk/src/ui/wm/public/activation_change_observer.h	(working copy)
@@ -5,14 +5,14 @@
 #ifndef UI_WM_PUBLIC_ACTIVATION_CHANGE_OBSERVER_H_
 #define UI_WM_PUBLIC_ACTIVATION_CHANGE_OBSERVER_H_
 
-#include "ui/wm/wm_export.h"
+#include "ui/aura/aura_export.h"
 
 namespace aura {
 class Window;
 
 namespace client {
 
-class WM_EXPORT ActivationChangeObserver {
+class AURA_EXPORT ActivationChangeObserver {
  public:
   // Called when |active| gains focus, or there is no active window
   // (|active| is NULL in this case.) |old_active| refers to the
@@ -33,10 +33,11 @@
 
 // Gets/Sets the ActivationChangeObserver for a specific window. This observer
 // is notified after the ActivationClient notifies all registered observers.
-WM_EXPORT void SetActivationChangeObserver(
+AURA_EXPORT void SetActivationChangeObserver(
     Window* window,
     ActivationChangeObserver* observer);
-WM_EXPORT ActivationChangeObserver* GetActivationChangeObserver(Window* window);
+AURA_EXPORT ActivationChangeObserver* GetActivationChangeObserver(
+    Window* window);
 
 }  // namespace client
 }  // namespace aura