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

Unified Diff: chrome/browser/profile_manager.h

Issue 431008: Make SystemMonitor not a Singleton and move it out of base (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: fix ChromeFrame build Created 11 years, 1 month 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
Index: chrome/browser/profile_manager.h
diff --git a/chrome/browser/profile_manager.h b/chrome/browser/profile_manager.h
index ecbbfc8fab5d79a1844ab2fda772772d68cdabd1..b52c7db592c584dbccd4f5daaf26b2ab672d74d1 100644
--- a/chrome/browser/profile_manager.h
+++ b/chrome/browser/profile_manager.h
@@ -11,11 +11,11 @@
#include <string>
#include <vector>
+#include "app/system_monitor.h"
#include "base/basictypes.h"
#include "base/file_path.h"
#include "base/message_loop.h"
#include "base/non_thread_safe.h"
-#include "base/system_monitor.h"
#include "base/values.h"
#include "chrome/browser/profile.h"
@@ -63,7 +63,7 @@ class AvailableProfile {
};
class ProfileManager : public NonThreadSafe,
- public base::SystemMonitor::PowerObserver {
+ public SystemMonitor::PowerObserver {
public:
ProfileManager();
virtual ~ProfileManager();

Powered by Google App Engine
This is Rietveld 408576698