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 |
11 #include "base/bind.h" | 11 #include "base/bind.h" |
12 #include "base/process_util.h" | |
13 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
14 #include "chrome/common/chrome_constants.h" | 13 #include "chrome/common/chrome_constants.h" |
15 #include "content/public/browser/browser_thread.h" | 14 #include "content/public/browser/browser_thread.h" |
16 #include "content/public/common/process_type.h" | 15 #include "content/public/common/process_type.h" |
17 #include "grit/chromium_strings.h" | 16 #include "grit/chromium_strings.h" |
18 #include "ui/base/l10n/l10n_util.h" | 17 #include "ui/base/l10n/l10n_util.h" |
19 | 18 |
20 using base::ProcessEntry; | 19 using base::ProcessEntry; |
21 using base::ProcessId; | 20 using base::ProcessId; |
22 using content::BrowserThread; | 21 using content::BrowserThread; |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
131 current_browser.name = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME); | 130 current_browser.name = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME); |
132 current_browser.process_name = | 131 current_browser.process_name = |
133 reinterpret_cast<unsigned int>(chrome::kBrowserProcessExecutableName); | 132 reinterpret_cast<unsigned int>(chrome::kBrowserProcessExecutableName); |
134 process_data_.push_back(current_browser); | 133 process_data_.push_back(current_browser); |
135 | 134 |
136 // Finally return to the browser thread. | 135 // Finally return to the browser thread. |
137 BrowserThread::PostTask( | 136 BrowserThread::PostTask( |
138 BrowserThread::UI, FROM_HERE, | 137 BrowserThread::UI, FROM_HERE, |
139 base::Bind(&MemoryDetails::CollectChildInfoOnUIThread, this)); | 138 base::Bind(&MemoryDetails::CollectChildInfoOnUIThread, this)); |
140 } | 139 } |
OLD | NEW |