| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 } // namespace | 97 } // namespace |
| 98 | 98 |
| 99 MemoryDetails::MemoryDetails() { | 99 MemoryDetails::MemoryDetails() { |
| 100 } | 100 } |
| 101 | 101 |
| 102 ProcessData* MemoryDetails::ChromeBrowser() { | 102 ProcessData* MemoryDetails::ChromeBrowser() { |
| 103 return &process_data_[0]; | 103 return &process_data_[0]; |
| 104 } | 104 } |
| 105 | 105 |
| 106 void MemoryDetails::CollectProcessData( | 106 void MemoryDetails::CollectProcessData( |
| 107 CollectionMode mode, | |
| 108 const std::vector<ProcessMemoryInformation>& chrome_processes) { | 107 const std::vector<ProcessMemoryInformation>& chrome_processes) { |
| 109 DCHECK(BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread()); | 108 DCHECK(BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread()); |
| 110 | 109 |
| 111 std::vector<ProcessMemoryInformation> all_processes(chrome_processes); | 110 std::vector<ProcessMemoryInformation> all_processes(chrome_processes); |
| 112 AddNonChildChromeProcesses(&all_processes); | 111 AddNonChildChromeProcesses(&all_processes); |
| 113 | 112 |
| 114 std::vector<ProcessEntry> processes; | 113 std::vector<ProcessEntry> processes; |
| 115 base::ProcessIterator process_iter(NULL); | 114 base::ProcessIterator process_iter(NULL); |
| 116 while (const ProcessEntry* process_entry = process_iter.NextProcessEntry()) { | 115 while (const ProcessEntry* process_entry = process_iter.NextProcessEntry()) { |
| 117 processes.push_back(*process_entry); | 116 processes.push_back(*process_entry); |
| (...skipping 14 matching lines...) Expand all Loading... |
| 132 current_browser.name = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME); | 131 current_browser.name = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME); |
| 133 current_browser.process_name = | 132 current_browser.process_name = |
| 134 base::ASCIIToUTF16(chrome::kBrowserProcessExecutableName); | 133 base::ASCIIToUTF16(chrome::kBrowserProcessExecutableName); |
| 135 process_data_.push_back(current_browser); | 134 process_data_.push_back(current_browser); |
| 136 | 135 |
| 137 // Finally return to the browser thread. | 136 // Finally return to the browser thread. |
| 138 BrowserThread::PostTask( | 137 BrowserThread::PostTask( |
| 139 BrowserThread::UI, FROM_HERE, | 138 BrowserThread::UI, FROM_HERE, |
| 140 base::Bind(&MemoryDetails::CollectChildInfoOnUIThread, this)); | 139 base::Bind(&MemoryDetails::CollectChildInfoOnUIThread, this)); |
| 141 } | 140 } |
| OLD | NEW |