diff options
| author | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-24 05:28:48 +0000 |
|---|---|---|
| committer | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-24 05:28:48 +0000 |
| commit | 36863701c0c60e0edd2262e3a6f700ef53a82542 (patch) | |
| tree | 2f27f963fc27d5fc702c4189eccb6728ff64eca2 /chrome | |
| parent | d0ea4a6e3c01b872a97250ce9d3e61d46cf7e913 (diff) | |
| download | chromium_src-36863701c0c60e0edd2262e3a6f700ef53a82542.zip chromium_src-36863701c0c60e0edd2262e3a6f700ef53a82542.tar.gz chromium_src-36863701c0c60e0edd2262e3a6f700ef53a82542.tar.bz2 | |
Stop thread watching on Mac to fix memory usage
on mac-release-10.5/intl2.
TBR=jar@chromium.org
BUG=73915
Review URL: http://codereview.chromium.org/6579030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75853 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/metrics/thread_watcher.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/metrics/thread_watcher.cc b/chrome/browser/metrics/thread_watcher.cc index cac9afd..6ce6212 100644 --- a/chrome/browser/metrics/thread_watcher.cc +++ b/chrome/browser/metrics/thread_watcher.cc @@ -192,7 +192,9 @@ ThreadWatcherList::ThreadWatcherList() DCHECK(!global_); global_ = this; // Register Notifications observer. +#if !defined(OS_MACOSX) MetricsService::SetupNotifications(®istrar_, this); +#endif } ThreadWatcherList::~ThreadWatcherList() { @@ -236,7 +238,9 @@ void ThreadWatcherList::RemoveNotifications() { if (!global_) return; base::AutoLock auto_lock(global_->lock_); +#if !defined(OS_MACOSX) global_->registrar_.RemoveAll(); +#endif } void ThreadWatcherList::Observe(NotificationType type, @@ -309,6 +313,7 @@ void WatchDogThread::Init() { BrowserProcessSubThread::Init(); +#if !defined(OS_MACOSX) const base::TimeDelta kSleepTime = base::TimeDelta::FromSeconds(5); const base::TimeDelta kUnresponsiveTime = base::TimeDelta::FromSeconds(10); ThreadWatcher::StartWatching(BrowserThread::UI, "UI", kSleepTime, @@ -321,4 +326,5 @@ void WatchDogThread::Init() { kUnresponsiveTime); ThreadWatcher::StartWatching(BrowserThread::CACHE, "CACHE", kSleepTime, kUnresponsiveTime); +#endif } |