From f0f612384a608b0e3e6a54283a19f622a4aebaf3 Mon Sep 17 00:00:00 2001 From: "derat@chromium.org" Date: Thu, 3 Apr 2014 15:11:49 +0000 Subject: Move UserActivityDetector from ash/wm/ to ui/wm/core/. This code is dependent on aura but not on ash. It'd be useful in app_shell, which doesn't use ash. BUG=354711 Review URL: https://codereview.chromium.org/222383002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261404 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/system/chromeos/power/power_event_observer.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ash/system/chromeos/power/power_event_observer.cc') diff --git a/ash/system/chromeos/power/power_event_observer.cc b/ash/system/chromeos/power/power_event_observer.cc index 39965f2..42d67f9 100644 --- a/ash/system/chromeos/power/power_event_observer.cc +++ b/ash/system/chromeos/power/power_event_observer.cc @@ -8,10 +8,10 @@ #include "ash/shell.h" #include "ash/system/tray/system_tray_notifier.h" #include "ash/wm/power_button_controller.h" -#include "ash/wm/user_activity_detector.h" #include "base/prefs/pref_service.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "ui/display/chromeos/output_configurator.h" +#include "ui/wm/core/user_activity_detector.h" namespace ash { namespace internal { -- cgit v1.1