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

Unified Diff: chrome/browser/chromeos/login/ui/webui_login_display.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/ui/webui_login_display.h
diff --git a/chrome/browser/chromeos/login/ui/webui_login_display.h b/chrome/browser/chromeos/login/ui/webui_login_display.h
index 2a8d18b1d021ae0b621edb83407a2bf35809ca80..4089aa7657420c5128912406382ea5d891f7f0ef 100644
--- a/chrome/browser/chromeos/login/ui/webui_login_display.h
+++ b/chrome/browser/chromeos/login/ui/webui_login_display.h
@@ -14,15 +14,16 @@
#include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h"
#include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
#include "components/user_manager/user.h"
+#include "ui/base/user_activity/user_activity_observer.h"
#include "ui/views/widget/widget.h"
-#include "ui/wm/core/user_activity_observer.h"
namespace chromeos {
+
// WebUI-based login UI implementation.
class WebUILoginDisplay : public LoginDisplay,
public NativeWindowDelegate,
public SigninScreenHandlerDelegate,
- public wm::UserActivityObserver {
+ public ui::UserActivityObserver {
public:
explicit WebUILoginDisplay(LoginDisplay::Delegate* delegate);
virtual ~WebUILoginDisplay();
@@ -80,7 +81,7 @@ class WebUILoginDisplay : public LoginDisplay,
virtual void HandleGetUsers() override;
virtual const user_manager::UserList& GetUsers() const override;
- // wm::UserActivityDetector implementation:
+ // ui::UserActivityDetector implementation:
virtual void OnUserActivity(const ui::Event* event) override;
private:

Powered by Google App Engine
This is Rietveld 408576698