| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/memory_details.h" | 5 #include "chrome/browser/memory_details.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "app/l10n_util.h" | 10 #include "app/l10n_util.h" |
| 11 #include "base/basictypes.h" | 11 #include "base/basictypes.h" |
| 12 #include "base/file_path.h" | 12 #include "base/file_path.h" |
| 13 #include "base/file_version_info.h" | 13 #include "base/file_version_info.h" |
| 14 #include "base/mac_util.h" | 14 #include "base/mac_util.h" |
| 15 #include "base/string_util.h" | 15 #include "base/string_util.h" |
| 16 #include "base/process_util.h" | 16 #include "base/process_util.h" |
| 17 #include "base/thread.h" | 17 #include "base/thread.h" |
| 18 #include "base/utf_string_conversions.h" | 18 #include "base/utf_string_conversions.h" |
| 19 #include "chrome/browser/browser_child_process_host.h" | 19 #include "chrome/browser/browser_child_process_host.h" |
| 20 #include "chrome/browser/browser_process.h" | |
| 21 #include "chrome/browser/browser_thread.h" | 20 #include "chrome/browser/browser_thread.h" |
| 22 #include "chrome/browser/process_info_snapshot.h" | 21 #include "chrome/browser/process_info_snapshot.h" |
| 23 #include "chrome/browser/renderer_host/backing_store_manager.h" | 22 #include "chrome/browser/renderer_host/backing_store_manager.h" |
| 24 #include "chrome/browser/renderer_host/render_process_host.h" | 23 #include "chrome/browser/renderer_host/render_process_host.h" |
| 25 #include "chrome/browser/tab_contents/navigation_entry.h" | 24 #include "chrome/browser/tab_contents/navigation_entry.h" |
| 26 #include "chrome/browser/tab_contents/tab_contents.h" | 25 #include "chrome/browser/tab_contents/tab_contents.h" |
| 27 #include "chrome/common/chrome_constants.h" | 26 #include "chrome/common/chrome_constants.h" |
| 28 #include "chrome/common/chrome_version_info.h" | 27 #include "chrome/common/chrome_version_info.h" |
| 29 #include "chrome/common/url_constants.h" | 28 #include "chrome/common/url_constants.h" |
| 30 #include "grit/chromium_strings.h" | 29 #include "grit/chromium_strings.h" |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 } | 220 } |
| 222 } | 221 } |
| 223 | 222 |
| 224 // Memory info. | 223 // Memory info. |
| 225 process_info.GetCommittedKBytesOfPID(info.pid, &info.committed); | 224 process_info.GetCommittedKBytesOfPID(info.pid, &info.committed); |
| 226 process_info.GetWorkingSetKBytesOfPID(info.pid, &info.working_set); | 225 process_info.GetWorkingSetKBytesOfPID(info.pid, &info.working_set); |
| 227 | 226 |
| 228 // Add the process info to our list. | 227 // Add the process info to our list. |
| 229 process_data_[CHROME_BROWSER].processes.push_back(info); | 228 process_data_[CHROME_BROWSER].processes.push_back(info); |
| 230 } | 229 } |
| OLD | NEW |