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

Side by Side Diff: chrome/browser/chromeos/idle_detector.cc

Issue 205713002: Add a basic demo mode browser test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix license Created 6 years, 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/chromeos/idle_detector.h" 5 #include "chrome/browser/chromeos/idle_detector.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/wm/user_activity_detector.h" 8 #include "ash/wm/user_activity_detector.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 17 matching lines...) Expand all
28 } 28 }
29 29
30 void IdleDetector::Start(const base::TimeDelta& timeout) { 30 void IdleDetector::Start(const base::TimeDelta& timeout) {
31 timeout_ = timeout; 31 timeout_ = timeout;
32 if (!ash::Shell::GetInstance()->user_activity_detector()->HasObserver(this)) 32 if (!ash::Shell::GetInstance()->user_activity_detector()->HasObserver(this))
33 ash::Shell::GetInstance()->user_activity_detector()->AddObserver(this); 33 ash::Shell::GetInstance()->user_activity_detector()->AddObserver(this);
34 ResetTimer(); 34 ResetTimer();
35 } 35 }
36 36
37 void IdleDetector::ResetTimer() { 37 void IdleDetector::ResetTimer() {
38 if (timer_.IsRunning()) { 38 if (timer_.IsRunning())
39 timer_.Reset(); 39 timer_.Reset();
40 } else { 40 else
41 timer_.Start(FROM_HERE, timeout_, idle_callback_); 41 timer_.Start(FROM_HERE, timeout_, idle_callback_);
42 }
43 } 42 }
44 43
45 } // namespace chromeos 44 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/idle_detector.h ('k') | chrome/browser/chromeos/login/app_launch_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698