diff options
author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 03:25:15 +0000 |
---|---|---|
committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 03:25:15 +0000 |
commit | 176aa48371da91eb98d675d87b4e70c7b26d696f (patch) | |
tree | 4c972de6ecd5a54650ab1dc7d421187f5d25834f /chrome/browser/task_manager_resource_providers.cc | |
parent | 9a3f0ac2899139ace97e399015259d028b4d5704 (diff) | |
download | chromium_src-176aa48371da91eb98d675d87b4e70c7b26d696f.zip chromium_src-176aa48371da91eb98d675d87b4e70c7b26d696f.tar.gz chromium_src-176aa48371da91eb98d675d87b4e70c7b26d696f.tar.bz2 |
Add Terminate() to the Process object, have RenderProcessHost use this to avoid some more Windows specific code.
Move Process and SharedMemory into the base namespace (most changes).
Review URL: http://codereview.chromium.org/10895
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5446 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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/task_manager_resource_providers.cc b/chrome/browser/task_manager_resource_providers.cc index 45c51eb..ceca70c 100644 --- a/chrome/browser/task_manager_resource_providers.cc +++ b/chrome/browser/task_manager_resource_providers.cc @@ -34,7 +34,7 @@ TaskManagerWebContentsResource::TaskManagerWebContentsResource( // We cache the process as when the WebContents is closed the process // becomes NULL and the TaskManager still needs it. process_ = web_contents_->process()->process().handle(); - pid_ = process_util::GetProcId(process_); + pid_ = base::GetProcId(process_); } TaskManagerWebContentsResource::~TaskManagerWebContentsResource() { @@ -236,7 +236,7 @@ TaskManagerPluginProcessResource::TaskManagerPluginProcessResource( : plugin_process_(plugin_proc), title_(), network_usage_support_(false) { - pid_ = process_util::GetProcId(plugin_proc.process()); + pid_ = base::GetProcId(plugin_proc.process()); if (!default_icon_) { ResourceBundle& rb = ResourceBundle::GetSharedInstance(); default_icon_ = rb.GetBitmapNamed(IDR_PLUGIN); @@ -399,7 +399,7 @@ void TaskManagerPluginProcessResourceProvider::AddToTaskManager( TaskManagerPluginProcessResource* resource = new TaskManagerPluginProcessResource(plugin_process_info); resources_[plugin_process_info] = resource; - pid_to_resources_[process_util::GetProcId(plugin_process_info.process())] = + pid_to_resources_[base::GetProcId(plugin_process_info.process())] = resource; task_manager_->AddResource(resource); } |