| Index: chrome/browser/task_manager/task_manager_resource_providers.h
|
| diff --git a/chrome/browser/task_manager/task_manager_resource_providers.h b/chrome/browser/task_manager/task_manager_resource_providers.h
|
| index 7f82dcd09ce293c918f328ae15b35ee5e455fddf..62497576bb2c308ee980e1f940ee7f67fdfc3e24 100644
|
| --- a/chrome/browser/task_manager/task_manager_resource_providers.h
|
| +++ b/chrome/browser/task_manager/task_manager_resource_providers.h
|
| @@ -41,6 +41,7 @@ class TaskManagerRendererResource : public TaskManager::Resource {
|
|
|
| // TaskManager::Resource methods:
|
| virtual base::ProcessHandle GetProcess() const OVERRIDE;
|
| + virtual int GetUniqueChildProcessId() const OVERRIDE;
|
| virtual Type GetType() const OVERRIDE;
|
| virtual int GetRoutingID() const OVERRIDE;
|
|
|
| @@ -74,6 +75,7 @@ class TaskManagerRendererResource : public TaskManager::Resource {
|
| private:
|
| base::ProcessHandle process_;
|
| int pid_;
|
| + int unique_process_id_;
|
|
|
| // RenderViewHost we use to fetch stats.
|
| content::RenderViewHost* render_view_host_;
|
| @@ -245,7 +247,8 @@ class TaskManagerChildProcessResource : public TaskManager::Resource {
|
| public:
|
| TaskManagerChildProcessResource(content::ProcessType type,
|
| const string16& name,
|
| - base::ProcessHandle handle);
|
| + base::ProcessHandle handle,
|
| + int unique_process_id);
|
| virtual ~TaskManagerChildProcessResource();
|
|
|
| // TaskManager::Resource methods:
|
| @@ -253,6 +256,7 @@ class TaskManagerChildProcessResource : public TaskManager::Resource {
|
| virtual string16 GetProfileName() const OVERRIDE;
|
| virtual SkBitmap GetIcon() const OVERRIDE;
|
| virtual base::ProcessHandle GetProcess() const OVERRIDE;
|
| + virtual int GetUniqueChildProcessId() const OVERRIDE;
|
| virtual Type GetType() const OVERRIDE;
|
| virtual bool SupportNetworkUsage() const OVERRIDE;
|
| virtual void SetSupportNetworkUsage() OVERRIDE;
|
| @@ -269,6 +273,7 @@ class TaskManagerChildProcessResource : public TaskManager::Resource {
|
| string16 name_;
|
| base::ProcessHandle handle_;
|
| int pid_;
|
| + int unique_process_id_;
|
| mutable string16 title_;
|
| bool network_usage_support_;
|
|
|
| @@ -347,6 +352,7 @@ class TaskManagerExtensionProcessResource : public TaskManager::Resource {
|
| virtual string16 GetProfileName() const OVERRIDE;
|
| virtual SkBitmap GetIcon() const OVERRIDE;
|
| virtual base::ProcessHandle GetProcess() const OVERRIDE;
|
| + virtual int GetUniqueChildProcessId() const OVERRIDE;
|
| virtual Type GetType() const OVERRIDE;
|
| virtual bool CanInspect() const OVERRIDE;
|
| virtual void Inspect() const OVERRIDE;
|
| @@ -369,6 +375,7 @@ class TaskManagerExtensionProcessResource : public TaskManager::Resource {
|
| // Cached data about the extension.
|
| base::ProcessHandle process_handle_;
|
| int pid_;
|
| + int unique_process_id_;
|
| string16 title_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TaskManagerExtensionProcessResource);
|
| @@ -425,6 +432,7 @@ class TaskManagerNotificationResource : public TaskManager::Resource {
|
| virtual string16 GetProfileName() const OVERRIDE;
|
| virtual SkBitmap GetIcon() const OVERRIDE;
|
| virtual base::ProcessHandle GetProcess() const OVERRIDE;
|
| + virtual int GetUniqueChildProcessId() const OVERRIDE;
|
| virtual Type GetType() const OVERRIDE;
|
| virtual bool CanInspect() const OVERRIDE;
|
| virtual void Inspect() const OVERRIDE;
|
| @@ -441,6 +449,7 @@ class TaskManagerNotificationResource : public TaskManager::Resource {
|
| // Cached data about the balloon host.
|
| base::ProcessHandle process_handle_;
|
| int pid_;
|
| + int unique_process_id_;
|
| string16 title_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TaskManagerNotificationResource);
|
| @@ -495,6 +504,7 @@ class TaskManagerBrowserProcessResource : public TaskManager::Resource {
|
| virtual string16 GetProfileName() const OVERRIDE;
|
| virtual SkBitmap GetIcon() const OVERRIDE;
|
| virtual base::ProcessHandle GetProcess() const OVERRIDE;
|
| + virtual int GetUniqueChildProcessId() const OVERRIDE;
|
| virtual Type GetType() const OVERRIDE;
|
|
|
| virtual bool SupportNetworkUsage() const OVERRIDE;
|
|
|