| 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 <psapi.h> | 7 #include <psapi.h> |
| 8 #include <TlHelp32.h> | 8 #include <TlHelp32.h> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 FIREFOX_BROWSER, | 31 FIREFOX_BROWSER, |
| 32 OPERA_BROWSER, | 32 OPERA_BROWSER, |
| 33 SAFARI_BROWSER, | 33 SAFARI_BROWSER, |
| 34 IE_64BIT_BROWSER, | 34 IE_64BIT_BROWSER, |
| 35 KONQUEROR_BROWSER, | 35 KONQUEROR_BROWSER, |
| 36 MAX_BROWSERS | 36 MAX_BROWSERS |
| 37 } BrowserProcess; | 37 } BrowserProcess; |
| 38 | 38 |
| 39 MemoryDetails::MemoryDetails() | 39 MemoryDetails::MemoryDetails() |
| 40 : user_metrics_mode_(UPDATE_USER_METRICS) { | 40 : user_metrics_mode_(UPDATE_USER_METRICS) { |
| 41 static const std::wstring google_browser_name = | 41 static const base::string16 google_browser_name = |
| 42 base::UTF16ToWide(l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); | 42 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME); |
| 43 struct { | 43 struct { |
| 44 const wchar_t* name; | 44 const wchar_t* name; |
| 45 const wchar_t* process_name; | 45 const wchar_t* process_name; |
| 46 } process_template[MAX_BROWSERS] = { | 46 } process_template[MAX_BROWSERS] = { |
| 47 { google_browser_name.c_str(), L"chrome.exe", }, | 47 { google_browser_name.c_str(), L"chrome.exe", }, |
| 48 { google_browser_name.c_str(), L"nacl64.exe", }, | 48 { google_browser_name.c_str(), L"nacl64.exe", }, |
| 49 { L"IE", L"iexplore.exe", }, | 49 { L"IE", L"iexplore.exe", }, |
| 50 { L"Firefox", L"firefox.exe", }, | 50 { L"Firefox", L"firefox.exe", }, |
| 51 { L"Opera", L"opera.exe", }, | 51 { L"Opera", L"opera.exe", }, |
| 52 { L"Safari", L"safari.exe", }, | 52 { L"Safari", L"safari.exe", }, |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 } | 153 } |
| 154 break; | 154 break; |
| 155 } | 155 } |
| 156 } while (::Process32Next(snapshot, &process_entry)); | 156 } while (::Process32Next(snapshot, &process_entry)); |
| 157 | 157 |
| 158 // Finally return to the browser thread. | 158 // Finally return to the browser thread. |
| 159 BrowserThread::PostTask( | 159 BrowserThread::PostTask( |
| 160 BrowserThread::UI, FROM_HERE, | 160 BrowserThread::UI, FROM_HERE, |
| 161 base::Bind(&MemoryDetails::CollectChildInfoOnUIThread, this)); | 161 base::Bind(&MemoryDetails::CollectChildInfoOnUIThread, this)); |
| 162 } | 162 } |
| OLD | NEW |