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

Unified Diff: chrome/browser/chromeos/system/automatic_reboot_manager.h

Issue 833893003: Move UserActivityDetector to ui/base/user_activity/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: don't build test on android Created 5 years, 11 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/system/automatic_reboot_manager.h
diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager.h b/chrome/browser/chromeos/system/automatic_reboot_manager.h
index 5ecf8d6bada4a2f87c0901fec014ce1a3f843a7d..00622dd1964c138d8da627676b31b49dc1446729 100644
--- a/chrome/browser/chromeos/system/automatic_reboot_manager.h
+++ b/chrome/browser/chromeos/system/automatic_reboot_manager.h
@@ -18,7 +18,7 @@
#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"
+#include "ui/base/user_activity/user_activity_observer.h"
class PrefRegistrySimple;
@@ -71,7 +71,7 @@ namespace system {
// /var/run ensures that it gets cleared automatically on every boot.
class AutomaticRebootManager : public PowerManagerClient::Observer,
public UpdateEngineClient::Observer,
- public wm::UserActivityObserver,
+ public ui::UserActivityObserver,
public content::NotificationObserver {
public:
// The current uptime and the uptime at which an update was applied and a
@@ -107,7 +107,7 @@ class AutomaticRebootManager : public PowerManagerClient::Observer,
virtual void UpdateStatusChanged(
const UpdateEngineClient::Status& status) override;
- // wm::UserActivityObserver:
+ // ui::UserActivityObserver:
virtual void OnUserActivity(const ui::Event* event) override;
// content::NotificationObserver:
« no previous file with comments | « chrome/browser/chromeos/session_length_limiter.cc ('k') | chrome/browser/chromeos/system/automatic_reboot_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698