summaryrefslogtreecommitdiffstats
path: root/chrome/browser/idle_chromeos.cc
diff options
context:
space:
mode:
authorderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-03 15:11:49 +0000
committerderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-03 15:11:49 +0000
commitf0f612384a608b0e3e6a54283a19f622a4aebaf3 (patch)
tree879fadfb2105aedf967412d1f70f8d00d369a091 /chrome/browser/idle_chromeos.cc
parent26585bd758df57dcd627d73cc7a8a87cb3bd3569 (diff)
downloadchromium_src-f0f612384a608b0e3e6a54283a19f622a4aebaf3.zip
chromium_src-f0f612384a608b0e3e6a54283a19f622a4aebaf3.tar.gz
chromium_src-f0f612384a608b0e3e6a54283a19f622a4aebaf3.tar.bz2
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
Diffstat (limited to 'chrome/browser/idle_chromeos.cc')
-rw-r--r--chrome/browser/idle_chromeos.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/idle_chromeos.cc b/chrome/browser/idle_chromeos.cc
index aa8c221..36a33a5 100644
--- a/chrome/browser/idle_chromeos.cc
+++ b/chrome/browser/idle_chromeos.cc
@@ -6,8 +6,8 @@
#include "ash/session_state_delegate.h"
#include "ash/shell.h"
-#include "ash/wm/user_activity_detector.h"
#include "base/time/time.h"
+#include "ui/wm/core/user_activity_detector.h"
void CalculateIdleTime(IdleTimeCallback notify) {
base::TimeDelta idle_time = base::TimeTicks::Now() -