chrome/browser/chromeos/idle_detector.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/idle_detector.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/dbus/display_power_service_provider.cc ('k') | chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/idle_detector.cc

diff --git a/chrome/browser/chromeos/idle_detector.cc b/chrome/browser/chromeos/idle_detector.cc

index 12e80c74c71b4c6e09f2b394f3e471beadb603e4..0d3950ea272995ce41e40737a6f0bfff0657165d 100644

--- a/chrome/browser/chromeos/idle_detector.cc

+++ b/chrome/browser/chromeos/idle_detector.cc

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

#include "chrome/browser/chromeos/idle_detector.h"

-#include "ash/shell.h"

#include "base/bind.h"

#include "base/logging.h"

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

@@ -16,9 +15,10 @@ IdleDetector::IdleDetector(const base::Closure& on_active_callback,

: active_callback_(on_active_callback), idle_callback_(on_idle_callback) {}

IdleDetector::~IdleDetector() {

- if (ash::Shell::HasInstance() &&

- ash::Shell::GetInstance()->user_activity_detector()->HasObserver(this))

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

+ wm::UserActivityDetector* user_activity_detector =

+ wm::UserActivityDetector::Get();

+ if (user_activity_detector && user_activity_detector->HasObserver(this))

+ user_activity_detector->RemoveObserver(this);

}

void IdleDetector::OnUserActivity(const ui::Event* event) {

@@ -29,8 +29,8 @@ void IdleDetector::OnUserActivity(const ui::Event* event) {

void IdleDetector::Start(const base::TimeDelta& timeout) {

timeout_ = timeout;

- if (!ash::Shell::GetInstance()->user_activity_detector()->HasObserver(this))

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

+ if (!wm::UserActivityDetector::Get()->HasObserver(this))

+ wm::UserActivityDetector::Get()->AddObserver(this);

ResetTimer();

}