Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(660)

Unified Diff: ash/system/chromeos/power/user_activity_notifier.cc

Issue 222383002: Move UserActivityDetector from ash/wm/ to ui/wm/core/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove an unneeded include Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/system/chromeos/power/user_activity_notifier.cc
diff --git a/ash/system/chromeos/power/user_activity_notifier.cc b/ash/system/chromeos/power/user_activity_notifier.cc
index 025116c264feb13ea45a5b41a09d72cfb84dd220..a67f33491e92e6a86dc16baa49f13d92b0eade89 100644
--- a/ash/system/chromeos/power/user_activity_notifier.cc
+++ b/ash/system/chromeos/power/user_activity_notifier.cc
@@ -4,13 +4,12 @@
#include "ash/system/chromeos/power/user_activity_notifier.h"
-#include "ash/shell.h"
-#include "ash/wm/user_activity_detector.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/power_manager_client.h"
#include "ui/events/event.h"
#include "ui/events/event_constants.h"
#include "ui/events/keycodes/keyboard_codes_posix.h"
+#include "ui/wm/core/user_activity_detector.h"
namespace ash {
namespace internal {
@@ -44,7 +43,7 @@ power_manager::UserActivityType GetUserActivityTypeForEvent(
} // namespace
-UserActivityNotifier::UserActivityNotifier(UserActivityDetector* detector)
+UserActivityNotifier::UserActivityNotifier(::wm::UserActivityDetector* detector)
: detector_(detector) {
detector_->AddObserver(this);
}

Powered by Google App Engine
This is Rietveld 408576698