chrome/browser/idle_chromeos.cc - Issue 833893003: Move UserActivityDetector to ui/base/user_activity/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/idle_chromeos.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 unified diff | Download patch

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/idle.h"	5 #include "chrome/browser/idle.h"

6	6

7 #include "ash/session/session_state_delegate.h"	7 #include "ash/session/session_state_delegate.h"

8 #include "ash/shell.h"	8 #include "ash/shell.h"

9 #include "base/time/time.h"	9 #include "base/time/time.h"

10 #include "ui/wm/core/user_activity_detector.h"	10 #include "ui/base/user_activity/user_activity_detector.h"

11	11

12 void CalculateIdleTime(IdleTimeCallback notify) {	12 void CalculateIdleTime(IdleTimeCallback notify) {

13 base::TimeDelta idle_time = base::TimeTicks::Now() -	13 base::TimeDelta idle_time = base::TimeTicks::Now() -

14 wm::UserActivityDetector::Get()->last_activity_time();	14 ui::UserActivityDetector::Get()->last_activity_time();

15 notify.Run(static_cast<int>(idle_time.InSeconds()));	15 notify.Run(static_cast<int>(idle_time.InSeconds()));

16 }	16 }

17	17

18 bool CheckIdleStateIsLocked() {	18 bool CheckIdleStateIsLocked() {

19 #if defined(USE_ATHENA)	19 #if defined(USE_ATHENA)

20 return false;	20 return false;

21 #else	21 #else

22 return ash::Shell::GetInstance()->session_state_delegate()->IsScreenLocked();	22 return ash::Shell::GetInstance()->session_state_delegate()->IsScreenLocked();

23 #endif	23 #endif

24 }	24 }

OLD	NEW