chrome/browser/idle_chromeos.cc - Issue 514293003: Run athena on chrome

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 514293003: Run athena on chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 6 years, 3 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

« no previous file with comments | « chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc ('k') | chrome/browser/notifications/message_center_notification_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/wm/core/user_activity_detector.h"

11	11

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

	13 #if defined(USE_ATHENA)
	sky 2014/09/02 19:10:26 How about idle_athena with NOTIMPLEMENTEDs? How about idle_athena with NOTIMPLEMENTEDs? oshima 2014/09/02 20:37:55 Done. Show quoted text On 2014/09/02 19:10:26, sky wrote: > How about idle_athena with NOTIMPLEMENTEDs? Done.
	14 // TODO(oshima): Implement this for athena. crbug.com/408752

	15 base::TimeDelta idle_time;

	16 #else

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

14 ash::Shell::GetInstance()->user_activity_detector()->last_activity_time();	18 ash::Shell::GetInstance()->user_activity_detector()->last_activity_time();

	19 #endif

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

16 }	21 }

17	22

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

	24 #if defined(USE_ATHENA)

	25 return false;

	26 #else

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

	28 #endif

20 }	29 }

OLD	NEW