diff options
author | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-30 18:59:46 +0000 |
---|---|---|
committer | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-30 18:59:46 +0000 |
commit | 0f4ffe84d7b3923b78f7a224910d9b913a62de8a (patch) | |
tree | 25b9448cce9fb10f972536df7385e9d10e9363b0 /chrome/browser/task_manager/task_manager.cc | |
parent | 7e6497fa01580df1a4642786797992f2a7ea01e8 (diff) | |
download | chromium_src-0f4ffe84d7b3923b78f7a224910d9b913a62de8a.zip chromium_src-0f4ffe84d7b3923b78f7a224910d9b913a62de8a.tar.gz chromium_src-0f4ffe84d7b3923b78f7a224910d9b913a62de8a.tar.bz2 |
TaskManager code cleanup.
Remove unused AddResourceProvider/RemovedResourceProvider and simplify TaskManagerModel constructor.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/6749038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79872 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager/task_manager.cc')
-rw-r--r-- | chrome/browser/task_manager/task_manager.cc | 61 |
1 files changed, 14 insertions, 47 deletions
diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc index c8c15b8..4db7900 100644 --- a/chrome/browser/task_manager/task_manager.cc +++ b/chrome/browser/task_manager/task_manager.cc @@ -75,35 +75,18 @@ TaskManagerModel::TaskManagerModel(TaskManager* task_manager) : update_requests_(0), update_state_(IDLE), goat_salt_(rand()) { - - TaskManagerBrowserProcessResourceProvider* browser_provider = - new TaskManagerBrowserProcessResourceProvider(task_manager); - browser_provider->AddRef(); - providers_.push_back(browser_provider); - TaskManagerBackgroundContentsResourceProvider* bc_provider = - new TaskManagerBackgroundContentsResourceProvider(task_manager); - bc_provider->AddRef(); - providers_.push_back(bc_provider); - TaskManagerTabContentsResourceProvider* wc_provider = - new TaskManagerTabContentsResourceProvider(task_manager); - wc_provider->AddRef(); - providers_.push_back(wc_provider); - TaskManagerPrerenderResourceProvider* prerender_provider = - new TaskManagerPrerenderResourceProvider(task_manager); - prerender_provider->AddRef(); - providers_.push_back(prerender_provider); - TaskManagerChildProcessResourceProvider* child_process_provider = - new TaskManagerChildProcessResourceProvider(task_manager); - child_process_provider->AddRef(); - providers_.push_back(child_process_provider); - TaskManagerExtensionProcessResourceProvider* extension_process_provider = - new TaskManagerExtensionProcessResourceProvider(task_manager); - extension_process_provider->AddRef(); - providers_.push_back(extension_process_provider); - TaskManagerNotificationResourceProvider* notification_provider = - new TaskManagerNotificationResourceProvider(task_manager); - notification_provider->AddRef(); - providers_.push_back(notification_provider); + AddResourceProvider( + new TaskManagerBrowserProcessResourceProvider(task_manager)); + AddResourceProvider( + new TaskManagerBackgroundContentsResourceProvider(task_manager)); + AddResourceProvider(new TaskManagerTabContentsResourceProvider(task_manager)); + AddResourceProvider(new TaskManagerPrerenderResourceProvider(task_manager)); + AddResourceProvider( + new TaskManagerChildProcessResourceProvider(task_manager)); + AddResourceProvider( + new TaskManagerExtensionProcessResourceProvider(task_manager)); + AddResourceProvider( + new TaskManagerNotificationResourceProvider(task_manager)); } TaskManagerModel::~TaskManagerModel() { @@ -577,19 +560,11 @@ void TaskManagerModel::StopUpdating() { void TaskManagerModel::AddResourceProvider( TaskManager::ResourceProvider* provider) { DCHECK(provider); + // AddRef matched with Release in destructor. + provider->AddRef(); providers_.push_back(provider); } -void TaskManagerModel::RemoveResourceProvider( - TaskManager::ResourceProvider* provider) { - DCHECK(provider); - ResourceProviderList::iterator iter = std::find(providers_.begin(), - providers_.end(), - provider); - DCHECK(iter != providers_.end()); - providers_.erase(iter); -} - void TaskManagerModel::RegisterForJobDoneNotifications() { net::g_url_request_job_tracker.AddObserver(this); } @@ -978,14 +953,6 @@ void TaskManager::ActivateProcess(int index) { chosen_tab_contents->tab_contents()->Activate(); } -void TaskManager::AddResourceProvider(ResourceProvider* provider) { - model_->AddResourceProvider(provider); -} - -void TaskManager::RemoveResourceProvider(ResourceProvider* provider) { - model_->RemoveResourceProvider(provider); -} - void TaskManager::AddResource(Resource* resource) { model_->AddResource(resource); } |