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

ui/wm/core/user_activity_detector.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 UI_WM_CORE_USER_ACTIVITY_DETECTOR_H_
 #define UI_WM_CORE_USER_ACTIVITY_DETECTOR_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
 #include "ui/events/event_handler.h"
-#include "ui/wm/wm_export.h"
+#include "ui/wm/core/wm_core_export.h"
 
 namespace wm {
 
 class UserActivityObserver;
 
 // Watches for input events and notifies observers that the user is active.
-class WM_EXPORT UserActivityDetector : public ui::EventHandler {
+class WM_CORE_EXPORT UserActivityDetector : public ui::EventHandler {
  public:
   // Minimum amount of time between notifications to observers.
   static const int kNotifyIntervalMs;
 
   // Amount of time that mouse events should be ignored after notification
   // is received that displays' power states are being changed.
   static const int kDisplayPowerChangeIgnoreMouseMs;
 
   UserActivityDetector();
   virtual ~UserActivityDetector();
@@ skipping 41 matching lines @@
   // is to avoid reporting mouse events that occur when displays are turned
   // on or off as user activity.
   base::TimeTicks honor_mouse_events_time_;
 
   DISALLOW_COPY_AND_ASSIGN(UserActivityDetector);
 };
 
 }  // namespace wm
 
 #endif  // UI_WM_CORE_USER_ACTIVITY_DETECTOR_H_