diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-18 03:47:48 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-18 03:47:48 +0000 |
| commit | 6dffde32e9bf00108ebe936b06f02fc80ed09fb4 (patch) | |
| tree | d2da2ecf38102a7b7997bbf5a3542a588fbeb330 /chrome/browser/task_manager_resource_providers.cc | |
| parent | 8c6add3b6648649eeadb60abdecbf6a1bec01860 (diff) | |
| download | chromium_src-6dffde32e9bf00108ebe936b06f02fc80ed09fb4.zip chromium_src-6dffde32e9bf00108ebe936b06f02fc80ed09fb4.tar.gz chromium_src-6dffde32e9bf00108ebe936b06f02fc80ed09fb4.tar.bz2 | |
Take out common functionality from PluginProcessHost and move it to ChildProcessHost.
Review URL: http://codereview.chromium.org/21443
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9935 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager_resource_providers.cc')
| -rw-r--r-- | chrome/browser/task_manager_resource_providers.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/task_manager_resource_providers.cc b/chrome/browser/task_manager_resource_providers.cc index ec95cbe..59b83ec 100644 --- a/chrome/browser/task_manager_resource_providers.cc +++ b/chrome/browser/task_manager_resource_providers.cc @@ -16,6 +16,7 @@ #include "chrome/browser/renderer_host/resource_message_filter.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/browser/tab_contents/web_contents.h" +#include "chrome/common/child_process_host.h" #include "chrome/common/notification_service.h" #include "chrome/common/resource_bundle.h" #include "chrome/common/stl_util-inl.h" @@ -264,7 +265,7 @@ TaskManagerChildProcessResource::TaskManagerChildProcessResource( network_usage_support_(false) { // We cache the process id because it's not cheap to calculate, and it won't // be available when we get the plugin disconnected notification. - pid_ = child_proc.process().pid(); + pid_ = child_proc.pid(); if (!default_icon_) { ResourceBundle& rb = ResourceBundle::GetSharedInstance(); default_icon_ = rb.GetBitmapNamed(IDR_PLUGIN); @@ -288,7 +289,7 @@ SkBitmap TaskManagerChildProcessResource::GetIcon() const { } HANDLE TaskManagerChildProcessResource::GetProcess() const { - return (const_cast<ChildProcessInfo&>(child_process_)).process().handle(); + return child_process_.handle(); } //////////////////////////////////////////////////////////////////////////////// @@ -427,7 +428,7 @@ void TaskManagerChildProcessResourceProvider::AddToTaskManager( // The ChildProcessInfo::Iterator has to be used from the IO thread. void TaskManagerChildProcessResourceProvider::RetrieveChildProcessInfo() { - for (ChildProcessInfo::Iterator iter; !iter.Done(); ++iter) { + for (ChildProcessHost::Iterator iter; !iter.Done(); ++iter) { existing_child_process_info_.push_back(**iter); } // Now notify the UI thread that we have retrieved information about child |