Move UserActivityDetector from ash/wm/ to ui/wm/core/.

chrome/browser/chromeos/system/automatic_reboot_manager.h

 // Copyright (c) 2013 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 CHROME_BROWSER_CHROMEOS_SYSTEM_AUTOMATIC_REBOOT_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_SYSTEM_AUTOMATIC_REBOOT_MANAGER_H_
 
-#include "ash/wm/user_activity_observer.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/dbus/update_engine_client.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
+#include "ui/wm/core/user_activity_observer.h"
 
 class PrefRegistrySimple;
 
 namespace base {
 class TickClock;
 }
 
 namespace chromeos {
 namespace system {
 
@@ skipping 34 matching lines @@
 // which a reboot should be requested and the grace period that follows it to
 // be recalculated.
 //
 // Reboots are scheduled in terms of device uptime. The current uptime is read
 // from /proc/uptime. The time at which a reboot became necessary to finish
 // applying an update is stored in /var/run/chrome/update_reboot_needed_uptime,
 // making it persist across browser restarts and crashes. Placing the file under
 // /var/run ensures that it gets cleared automatically on every boot.
 class AutomaticRebootManager : public PowerManagerClient::Observer,
                                public UpdateEngineClient::Observer,
-                               public ash::UserActivityObserver,
+                               public wm::UserActivityObserver,
                                public content::NotificationObserver {
  public:
   // The current uptime and the uptime at which an update was applied and a
   // reboot became necessary (if any). Used to pass this information from the
   // blocking thread pool to the UI thread.
   struct SystemEventTimes {
     SystemEventTimes();
     SystemEventTimes(const base::TimeDelta& uptime,
                      const base::TimeDelta& update_reboot_needed_uptime);
 
@@ skipping 10 matching lines @@
   void AddObserver(AutomaticRebootManagerObserver* observer);
   void RemoveObserver(AutomaticRebootManagerObserver* observer);
 
   // PowerManagerClient::Observer:
   virtual void SystemResumed(const base::TimeDelta& sleep_duration) OVERRIDE;
 
   // UpdateEngineClient::Observer:
   virtual void UpdateStatusChanged(
       const UpdateEngineClient::Status& status) OVERRIDE;
 
-  // ash::UserActivityObserver:
+  // wm::UserActivityObserver:
   virtual void OnUserActivity(const ui::Event* event) OVERRIDE;
 
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   static void RegisterPrefs(PrefRegistrySimple* registry);
 
  private:
@@ skipping 51 matching lines @@
 
   ObserverList<AutomaticRebootManagerObserver, true> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(AutomaticRebootManager);
 };
 
 }  // namespace system
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_SYSTEM_AUTOMATIC_REBOOT_MANAGER_H_