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

Unified Diff: chrome/browser/chromeos/policy/recommendation_restorer.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: chrome/browser/chromeos/policy/recommendation_restorer.cc
diff --git a/chrome/browser/chromeos/policy/recommendation_restorer.cc b/chrome/browser/chromeos/policy/recommendation_restorer.cc
index 7c2ec1094de535b2da6ab75fc68f20a2751d7803..5ace88d04c059cb1ff3ab66d4b6de9d5bbb4b876 100644
--- a/chrome/browser/chromeos/policy/recommendation_restorer.cc
+++ b/chrome/browser/chromeos/policy/recommendation_restorer.cc
@@ -5,7 +5,6 @@
#include "chrome/browser/chromeos/policy/recommendation_restorer.h"
#include "ash/shell.h"
-#include "ash/wm/user_activity_detector.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/location.h"
@@ -20,6 +19,7 @@
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/notification_source.h"
+#include "ui/wm/core/user_activity_detector.h"
namespace policy {
@@ -103,7 +103,7 @@ void RecommendationRestorer::Restore(bool allow_delay,
allow_delay = false;
} else if (allow_delay && ash::Shell::HasInstance()) {
// Skip the delay if there has been no user input since the browser started.
- const ash::UserActivityDetector* user_activity_detector =
+ const wm::UserActivityDetector* user_activity_detector =
ash::Shell::GetInstance()->user_activity_detector();
allow_delay = !user_activity_detector->last_activity_time().is_null();
}
@@ -128,7 +128,7 @@ void RecommendationRestorer::StartTimer() {
// active, causing it to fire only when the user remains idle for
// |kRestoreDelayInMs|.
if (ash::Shell::HasInstance()) {
- ash::UserActivityDetector* user_activity_detector =
+ wm::UserActivityDetector* user_activity_detector =
ash::Shell::GetInstance()->user_activity_detector();
if (!user_activity_detector->HasObserver(this))
user_activity_detector->AddObserver(this);

Powered by Google App Engine
This is Rietveld 408576698