Style fixes for demo mode.

chrome/browser/chromeos/idle_detector.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/idle_detector.h"
 
 #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 {
 
 IdleDetector::IdleDetector(const base::Closure& on_active_callback,
                            const base::Closure& on_idle_callback)
     : active_callback_(on_active_callback), idle_callback_(on_idle_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) {
   if (!active_callback_.is_null())
     active_callback_.Run();
   ResetTimer();
 }
 
 void IdleDetector::Start(const base::TimeDelta& timeout) {
   timeout_ = timeout;
   if (!ash::Shell::GetInstance()->user_activity_detector()->HasObserver(this))
     ash::Shell::GetInstance()->user_activity_detector()->AddObserver(this);
   ResetTimer();
 }
 
 void IdleDetector::ResetTimer() {
-  if (timer_.IsRunning()) {
+  if (timer_.IsRunning())
     timer_.Reset();
-  } else {
+  else
     timer_.Start(FROM_HERE, timeout_, idle_callback_);
-  }
 }
 
 }  // namespace chromeos