| Index: chrome/browser/task_manager/task_manager.cc
|
| diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc
|
| index 86d08e44c22b641c54b0a6b61afb46cb7812acad..af863b3e9c77a3718e8a95e5cbead73565c82107 100644
|
| --- a/chrome/browser/task_manager/task_manager.cc
|
| +++ b/chrome/browser/task_manager/task_manager.cc
|
| @@ -586,11 +586,16 @@ bool TaskManagerModel::GetPhysicalMemory(int index, size_t* result) const {
|
| !iter->second->GetWorkingSetKBytes(&ws_usage))
|
| return false;
|
|
|
| + values.is_physical_memory_valid = true;
|
| +#if defined(OS_LINUX)
|
| + // On Linux private memory is also resident. Just use it.
|
| + values.physical_memory = ws_usage.priv * 1024;
|
| +#else
|
| // Memory = working_set.private + working_set.shareable.
|
| // We exclude the shared memory.
|
| - values.is_physical_memory_valid = true;
|
| values.physical_memory = iter->second->GetWorkingSetSize();
|
| values.physical_memory -= ws_usage.shared * 1024;
|
| +#endif
|
| }
|
| *result = values.physical_memory;
|
| return true;
|
|
|