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/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
13 #include "base/process/process_iterator.h" | 13 #include "base/process/process_iterator.h" |
14 #include "base/strings/utf_string_conversions.h" | 14 #include "base/strings/utf_string_conversions.h" |
15 #include "chrome/common/chrome_constants.h" | 15 #include "chrome/common/chrome_constants.h" |
| 16 #include "chrome/grit/chromium_strings.h" |
16 #include "content/public/browser/browser_thread.h" | 17 #include "content/public/browser/browser_thread.h" |
17 #include "content/public/common/process_type.h" | 18 #include "content/public/common/process_type.h" |
18 #include "grit/chromium_strings.h" | |
19 #include "ui/base/l10n/l10n_util.h" | 19 #include "ui/base/l10n/l10n_util.h" |
20 | 20 |
21 using base::ProcessEntry; | 21 using base::ProcessEntry; |
22 using base::ProcessId; | 22 using base::ProcessId; |
23 using content::BrowserThread; | 23 using content::BrowserThread; |
24 | 24 |
25 namespace { | 25 namespace { |
26 | 26 |
27 // A helper for |CollectProcessData()| to include the chrome sandboxed | 27 // A helper for |CollectProcessData()| to include the chrome sandboxed |
28 // processes in android which are not running as a child of the browser | 28 // processes in android which are not running as a child of the browser |
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
133 current_browser.name = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME); | 133 current_browser.name = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME); |
134 current_browser.process_name = | 134 current_browser.process_name = |
135 base::ASCIIToUTF16(chrome::kBrowserProcessExecutableName); | 135 base::ASCIIToUTF16(chrome::kBrowserProcessExecutableName); |
136 process_data_.push_back(current_browser); | 136 process_data_.push_back(current_browser); |
137 | 137 |
138 // Finally return to the browser thread. | 138 // Finally return to the browser thread. |
139 BrowserThread::PostTask( | 139 BrowserThread::PostTask( |
140 BrowserThread::UI, FROM_HERE, | 140 BrowserThread::UI, FROM_HERE, |
141 base::Bind(&MemoryDetails::CollectChildInfoOnUIThread, this)); | 141 base::Bind(&MemoryDetails::CollectChildInfoOnUIThread, this)); |
142 } | 142 } |
OLD | NEW |