Revert of Rename wm_core_export.h to wm_export.h and the wm_core target to just wm

ui/wm/core/window_modality_controller.h

Index: ui/wm/core/window_modality_controller.h
diff --git a/ui/wm/core/window_modality_controller.h b/ui/wm/core/window_modality_controller.h
index 4d52c2190ba9d22e4da19e37a2e50eb51f6a867d..d098d57fdc1a1f0485c286585cc996965421688d 100644
--- a/ui/wm/core/window_modality_controller.h
+++ b/ui/wm/core/window_modality_controller.h
@@ -11,7 +11,7 @@
 #include "ui/aura/env_observer.h"
 #include "ui/aura/window_observer.h"
 #include "ui/events/event_handler.h"
-#include "ui/wm/wm_export.h"
+#include "ui/wm/core/wm_core_export.h"
 
 namespace ui {
 class EventTarget;
@@ -21,18 +21,18 @@
 namespace wm {
 
 // Sets the modal parent for the child.
-WM_EXPORT void SetModalParent(aura::Window* child, aura::Window* parent);
+WM_CORE_EXPORT void SetModalParent(aura::Window* child, aura::Window* parent);
 
 // Returns the modal transient child of |window|, or NULL if |window| does not
 // have any modal transient children.
-WM_EXPORT aura::Window* GetModalTransient(aura::Window* window);
+WM_CORE_EXPORT aura::Window* GetModalTransient(aura::Window* window);
 
 // WindowModalityController is an event filter that consumes events sent to
 // windows that are the transient parents of window-modal windows. This filter
 // must be added to the CompoundEventFilter so that activation works properly.
-class WM_EXPORT WindowModalityController : public ui::EventHandler,
-                                           public aura::EnvObserver,
-                                           public aura::WindowObserver {
+class WM_CORE_EXPORT WindowModalityController : public ui::EventHandler,
+                                                public aura::EnvObserver,
+                                                public aura::WindowObserver {
  public:
   explicit WindowModalityController(ui::EventTarget* event_target);
   virtual ~WindowModalityController();