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

Unified Diff: base/system_monitor.h

Issue 164424: Simple cleanup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | base/system_monitor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/system_monitor.h
===================================================================
--- base/system_monitor.h (revision 23214)
+++ base/system_monitor.h (working copy)
@@ -16,7 +16,6 @@
#endif // !OS_WIN
#include "base/observer_list_threadsafe.h"
-#include "base/singleton.h"
#if defined(ENABLE_BATTERY_MONITORING)
#include "base/timer.h"
#endif // defined(ENABLE_BATTERY_MONITORING)
@@ -28,12 +27,8 @@
// TODO(mbelshe): Add support beyond just power management.
class SystemMonitor {
public:
- // Access to the Singleton
- static SystemMonitor* Get() {
- // Uses the LeakySingletonTrait because cleanup is optional.
- return
- Singleton<SystemMonitor, LeakySingletonTraits<SystemMonitor> >::get();
- }
+ // Retrieves the Singleton.
+ static SystemMonitor* Get();
// Start the System Monitor within a process. This method
// is provided so that the battery check can be deferred.
@@ -67,7 +62,7 @@
// lengthy operations are needed, the observer should take care to invoke
// the operation on an appropriate thread.
class PowerObserver {
- public:
+ public:
// Notification of a change in power status of the computer, such
// as from switching between battery and A/C power.
virtual void OnPowerStateChange(SystemMonitor*) = 0;
« no previous file with comments | « no previous file | base/system_monitor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698