chrome/browser/chromeos/login/screens/user_selection_screen.cc - Issue 833893003: Move UserActivityDetector to ui/base/user_activity/.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/screens/user_selection_screen.cc

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

« no previous file with comments | « chrome/browser/chromeos/login/screens/user_selection_screen.h ('k') | chrome/browser/chromeos/login/ui/webui_login_display.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/screens/user_selection_screen.cc

diff --git a/chrome/browser/chromeos/login/screens/user_selection_screen.cc b/chrome/browser/chromeos/login/screens/user_selection_screen.cc

index d0ce95f9c3bc71324dbea5b03ac97b5b2cf3a494..16cac17ccf0d0fcd904247bd2a7924c0ba20da10 100644

--- a/chrome/browser/chromeos/login/screens/user_selection_screen.cc

+++ b/chrome/browser/chromeos/login/screens/user_selection_screen.cc

@@ -23,7 +23,7 @@

#include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"

#include "components/user_manager/user_manager.h"

#include "components/user_manager/user_type.h"

-#include "ui/wm/core/user_activity_detector.h"

+#include "ui/base/user_activity/user_activity_detector.h"

namespace chromeos {

@@ -114,7 +114,7 @@ UserSelectionScreen::UserSelectionScreen(const std::string& display_type)

UserSelectionScreen::~UserSelectionScreen() {

ScreenlockBridge::Get()->SetLockHandler(nullptr);

- wm::UserActivityDetector* activity_detector = wm::UserActivityDetector::Get();

+ ui::UserActivityDetector* activity_detector = ui::UserActivityDetector::Get();

if (activity_detector->HasObserver(this))

activity_detector->RemoveObserver(this);

}

@@ -227,7 +227,7 @@ void UserSelectionScreen::Init(const user_manager::UserList& users,

users_ = users;

show_guest_ = show_guest;

- wm::UserActivityDetector* activity_detector = wm::UserActivityDetector::Get();

+ ui::UserActivityDetector* activity_detector = ui::UserActivityDetector::Get();

if (!activity_detector->HasObserver(this))

activity_detector->AddObserver(this);

}