| Index: chrome/browser/task_manager.h
|
| ===================================================================
|
| --- chrome/browser/task_manager.h (revision 5371)
|
| +++ chrome/browser/task_manager.h (working copy)
|
| @@ -36,7 +36,7 @@
|
| class Window;
|
| }
|
|
|
| -namespace process_util {
|
| +namespace base {
|
| class ProcessMetrics;
|
| }
|
|
|
| @@ -220,7 +220,7 @@
|
| };
|
|
|
| typedef std::map<HANDLE, std::vector<TaskManager::Resource*>*> GroupMap;
|
| - typedef std::map<HANDLE, process_util::ProcessMetrics*> MetricsMap;
|
| + typedef std::map<HANDLE, base::ProcessMetrics*> MetricsMap;
|
| typedef std::map<HANDLE, int> CPUUsageMap;
|
| typedef std::map<TaskManager::Resource*, int64> ResourceValueMap;
|
| typedef std::vector<TaskManager::Resource*> ResourceList;
|
| @@ -259,15 +259,15 @@
|
|
|
| // Retrieves the private memory (in KB) that should be displayed from the
|
| // passed |process_metrics|.
|
| - size_t GetPrivateMemory(process_util::ProcessMetrics* process_metrics);
|
| + size_t GetPrivateMemory(base::ProcessMetrics* process_metrics);
|
|
|
| // Returns the shared memory (in KB) that should be displayed from the passed
|
| // |process_metrics|.
|
| - size_t GetSharedMemory(process_util::ProcessMetrics* process_metrics);
|
| + size_t GetSharedMemory(base::ProcessMetrics* process_metrics);
|
|
|
| // Returns the pysical memory (in KB) that should be displayed from the passed
|
| // |process_metrics|.
|
| - size_t GetPhysicalMemory(process_util::ProcessMetrics* process_metrics);
|
| + size_t GetPhysicalMemory(base::ProcessMetrics* process_metrics);
|
|
|
| // Returns the stat value at the column |col_id| that should be displayed from
|
| // the passed |process_metrics|.
|
| @@ -277,8 +277,8 @@
|
| // Returns true if there was a ProcessMetrics available for both rows.
|
| bool GetProcessMetricsForRows(int row1,
|
| int row2,
|
| - process_util::ProcessMetrics** proc_metrics1,
|
| - process_util::ProcessMetrics** proc_metrics2);
|
| + base::ProcessMetrics** proc_metrics1,
|
| + base::ProcessMetrics** proc_metrics2);
|
|
|
| // The list of providers to the task manager. They are ref counted.
|
| ResourceProviderList providers_;
|
|
|