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

Side by Side Diff: base/timer/hi_res_timer_manager_win.cc

Issue 226263008: Revert of Attempting to resolve a race condition with PowerMonitor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/timer/hi_res_timer_manager.h" 5 #include "base/timer/hi_res_timer_manager.h"
6 6
7 #include "base/power_monitor/power_monitor.h" 7 #include "base/power_monitor/power_monitor.h"
8 #include "base/time/time.h" 8 #include "base/time/time.h"
9 9
10 namespace base { 10 namespace base {
11 11
12 HighResolutionTimerManager::HighResolutionTimerManager() 12 HighResolutionTimerManager::HighResolutionTimerManager()
13 : hi_res_clock_available_(false) { 13 : hi_res_clock_available_(false) {
14 base::PowerMonitor::AddObserver(this); 14 base::PowerMonitor* power_monitor = base::PowerMonitor::Get();
15 UseHiResClock(!base::PowerMonitor::IsOnBatteryPower()); 15 DCHECK(power_monitor != NULL);
16 power_monitor->AddObserver(this);
17 UseHiResClock(!power_monitor->IsOnBatteryPower());
16 } 18 }
17 19
18 HighResolutionTimerManager::~HighResolutionTimerManager() { 20 HighResolutionTimerManager::~HighResolutionTimerManager() {
19 base::PowerMonitor::RemoveObserver(this); 21 base::PowerMonitor::Get()->RemoveObserver(this);
20 UseHiResClock(false); 22 UseHiResClock(false);
21 } 23 }
22 24
23 void HighResolutionTimerManager::OnPowerStateChange(bool on_battery_power) { 25 void HighResolutionTimerManager::OnPowerStateChange(bool on_battery_power) {
24 UseHiResClock(!on_battery_power); 26 UseHiResClock(!on_battery_power);
25 } 27 }
26 28
27 void HighResolutionTimerManager::UseHiResClock(bool use) { 29 void HighResolutionTimerManager::UseHiResClock(bool use) {
28 if (use == hi_res_clock_available_) 30 if (use == hi_res_clock_available_)
29 return; 31 return;
30 hi_res_clock_available_ = use; 32 hi_res_clock_available_ = use;
31 base::Time::EnableHighResolutionTimer(use); 33 base::Time::EnableHighResolutionTimer(use);
32 } 34 }
33 35
34 } // namespace base 36 } // namespace base
OLDNEW
« no previous file with comments | « base/timer/hi_res_timer_manager_unittest.cc ('k') | chrome/browser/extensions/event_router_forwarder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698