Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7770)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified 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, 4 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/idle_chromeos.cc
diff --git a/chrome/browser/idle_chromeos.cc b/chrome/browser/idle_chromeos.cc
index 62a72d46324bd95d8af0cc1a26a5ffcaeeb0c8c4..4d38a7335506a423f0e7cf18da846c1884a6b0f6 100644
--- a/chrome/browser/idle_chromeos.cc
+++ b/chrome/browser/idle_chromeos.cc
@@ -10,11 +10,20 @@
#include "ui/wm/core/user_activity_detector.h"
void CalculateIdleTime(IdleTimeCallback notify) {
+#if defined(USE_ATHENA)
sky 2014/09/02 19:10:26 How about idle_athena with NOTIMPLEMENTEDs?
oshima 2014/09/02 20:37:55 Done.
+ // TODO(oshima): Implement this for athena. crbug.com/408752
+ base::TimeDelta idle_time;
+#else
base::TimeDelta idle_time = base::TimeTicks::Now() -
ash::Shell::GetInstance()->user_activity_detector()->last_activity_time();
+#endif
notify.Run(static_cast<int>(idle_time.InSeconds()));
}
bool CheckIdleStateIsLocked() {
+#if defined(USE_ATHENA)
+ return false;
+#else
return ash::Shell::GetInstance()->session_state_delegate()->IsScreenLocked();
+#endif
}
« 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 »

Powered by Google App Engine
This is Rietveld 408576698