diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 21:22:31 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 21:22:31 +0000 |
| commit | 08110ceae09a5e148e67bebd712e7ba1840ccf42 (patch) | |
| tree | 94bdbbc82317bc6f7579d552aace6becd1beaab2 /chrome/browser/profiles/profile_manager.cc | |
| parent | a61c5c9bb6524d77c30b6a18f542c0e4616ee7bc (diff) | |
| download | chromium_src-08110ceae09a5e148e67bebd712e7ba1840ccf42.zip chromium_src-08110ceae09a5e148e67bebd712e7ba1840ccf42.tar.gz chromium_src-08110ceae09a5e148e67bebd712e7ba1840ccf42.tar.bz2 | |
Move SystemMonitor to src/ui/base/system_monitor.
Move HiResTimerManager to src/chrome/common.
BUG=none
TEST=none
TBR=brettw
Review URL: http://codereview.chromium.org/6361002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71487 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profiles/profile_manager.cc')
| -rw-r--r-- | chrome/browser/profiles/profile_manager.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc index 87a03ea..2bae317 100644 --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc @@ -51,7 +51,7 @@ Profile* ProfileManager::GetDefaultProfile() { } ProfileManager::ProfileManager() : logged_in_(false) { - SystemMonitor::Get()->AddObserver(this); + ui::SystemMonitor::Get()->AddObserver(this); #if defined(OS_CHROMEOS) registrar_.Add( this, @@ -61,7 +61,7 @@ ProfileManager::ProfileManager() : logged_in_(false) { } ProfileManager::~ProfileManager() { - SystemMonitor* system_monitor = SystemMonitor::Get(); + ui::SystemMonitor* system_monitor = ui::SystemMonitor::Get(); if (system_monitor) system_monitor->RemoveObserver(this); |