Index: chrome/browser/chromeos/idle_detector.cc |
diff --git a/chrome/browser/chromeos/idle_detector.cc b/chrome/browser/chromeos/idle_detector.cc |
index a4391667ca5e110992b9aeaa03efc5f76e290d07..5085a17f5c1969ed9cd86a2826f92d20ad9bf56b 100644 |
--- a/chrome/browser/chromeos/idle_detector.cc |
+++ b/chrome/browser/chromeos/idle_detector.cc |
@@ -6,8 +6,7 @@ |
#include "ash/shell.h" |
#include "ash/wm/user_activity_detector.h" |
-#include "base/bind.h" |
-#include "base/logging.h" |
+#include "base/location.h" |
namespace chromeos { |
@@ -17,8 +16,9 @@ IdleDetector::IdleDetector(const base::Closure& on_active_callback, |
IdleDetector::~IdleDetector() { |
if (ash::Shell::HasInstance() && |
- ash::Shell::GetInstance()->user_activity_detector()->HasObserver(this)) |
+ ash::Shell::GetInstance()->user_activity_detector()->HasObserver(this)) { |
ash::Shell::GetInstance()->user_activity_detector()->RemoveObserver(this); |
+ } |
} |
void IdleDetector::OnUserActivity(const ui::Event* event) { |
@@ -35,11 +35,10 @@ void IdleDetector::Start(const base::TimeDelta& timeout) { |
} |
void IdleDetector::ResetTimer() { |
- if (timer_.IsRunning()) { |
+ if (timer_.IsRunning()) |
timer_.Reset(); |
- } else { |
+ else |
timer_.Start(FROM_HERE, timeout_, idle_callback_); |
- } |
} |
} // namespace chromeos |