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

Index: chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout_unittest.cc

diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout_unittest.cc b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout_unittest.cc

index 3f82440d9c4b140b917aa6029878167d9a7cf898..4879d5fd327b009041c308a8d1fe7512625e3b8f 100644

--- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout_unittest.cc

+++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout_unittest.cc

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

#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h"

-#include "ash/shell.h"

#include "ash/test/ash_test_base.h"

#include "base/bind.h"

#include "base/memory/scoped_ptr.h"

@@ -44,8 +43,7 @@ class KioskModeIdleLogoutTest : public ash::test::AshTestBase {

}

bool UserActivityObserverRegistered() {

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

- idle_logout_);

+ return wm::UserActivityDetector::Get()->HasObserver(idle_logout_);

}

ScopedDeviceSettingsTestHelper device_settings_test_helper_;