chrome/browser/chromeos/login/screens/user_selection_screen.cc - Issue 693643004: Make UserActivityDetector a singleton

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 693643004: Make UserActivityDetector a singleton (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_do_not_use_ash45

Patch Set: Created 6 years, 1 month 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/kiosk_mode/kiosk_mode_screensaver.cc ('k') | chrome/browser/chromeos/login/ui/webui_login_display.cc » ('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 49ad57d7b953d9ae6349c168e7ba481723d55a29..be4ae6fe865bbf98721a83aee0fb938ca442b9a2 100644

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

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

@@ -4,7 +4,6 @@

#include "chrome/browser/chromeos/login/screens/user_selection_screen.h"

-#include "ash/shell.h"

#include "base/location.h"

#include "base/logging.h"

#include "base/prefs/pref_service.h"

@@ -106,13 +105,9 @@ UserSelectionScreen::UserSelectionScreen() : handler_(NULL) {

}

UserSelectionScreen::~UserSelectionScreen() {

-#if !defined(USE_ATHENA)

- // TODO(dpolukhin): crbug.com/408752

- wm::UserActivityDetector* activity_detector =

- ash::Shell::GetInstance()->user_activity_detector();

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

if (activity_detector->HasObserver(this))

activity_detector->RemoveObserver(this);

-#endif

}

// static

@@ -210,13 +205,9 @@ void UserSelectionScreen::Init(const user_manager::UserList& users,

users_ = users;

show_guest_ = show_guest;

-#if !defined(USE_ATHENA)

- // TODO(dpolukhin): crbug.com/408752

- wm::UserActivityDetector* activity_detector =

- ash::Shell::GetInstance()->user_activity_detector();

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

if (!activity_detector->HasObserver(this))

activity_detector->AddObserver(this);

-#endif

}

void UserSelectionScreen::OnBeforeUserRemoved(const std::string& username) {