Index: chrome/browser/idle_chromeos.cc |
diff --git a/chrome/browser/idle_chromeos.cc b/chrome/browser/idle_chromeos.cc |
index 62a72d46324bd95d8af0cc1a26a5ffcaeeb0c8c4..f61ff5e8d57dc9bb9af11621779772edc37bbadb 100644 |
--- a/chrome/browser/idle_chromeos.cc |
+++ b/chrome/browser/idle_chromeos.cc |
@@ -10,11 +10,21 @@ |
#include "ui/wm/core/user_activity_detector.h" |
void CalculateIdleTime(IdleTimeCallback notify) { |
+#if defined(USE_ATHENA) |
+ // TODO(oshima): Implement this for athena. crbug.com/408752 |
+ base::TimeDelta idle_time; |
+ NOTIMPLEMENTED(); |
+#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 |
} |