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

Unified Diff: chrome/browser/chromeos/login/screens/user_selection_screen.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/login/screens/user_selection_screen.h
diff --git a/chrome/browser/chromeos/login/screens/user_selection_screen.h b/chrome/browser/chromeos/login/screens/user_selection_screen.h
index 44263079147800b7677480917d701830292b3aae..b89c9c304c4bb79542ae24755a73486c4a542c79 100644
--- a/chrome/browser/chromeos/login/screens/user_selection_screen.h
+++ b/chrome/browser/chromeos/login/screens/user_selection_screen.h
@@ -16,7 +16,7 @@
#include "chrome/browser/chromeos/login/ui/models/user_board_model.h"
#include "chrome/browser/signin/screenlock_bridge.h"
#include "components/user_manager/user.h"
-#include "ui/wm/core/user_activity_observer.h"
+#include "ui/base/user_activity/user_activity_observer.h"
class EasyUnlockService;
@@ -26,7 +26,7 @@ class LoginDisplayWebUIHandler;
class UserBoardView;
// This class represents User Selection screen: user pod-based login screen.
-class UserSelectionScreen : public wm::UserActivityObserver,
+class UserSelectionScreen : public ui::UserActivityObserver,
public ScreenlockBridge::LockHandler,
public UserBoardModel {
public:
@@ -53,7 +53,7 @@ class UserSelectionScreen : public wm::UserActivityObserver,
void HandleGetUsers();
- // wm::UserActivityDetector implementation:
+ // ui::UserActivityDetector implementation:
virtual void OnUserActivity(const ui::Event* event) override;
void InitEasyUnlock();
« no previous file with comments | « chrome/browser/chromeos/idle_detector.cc ('k') | chrome/browser/chromeos/login/screens/user_selection_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698