summaryrefslogtreecommitdiffstats
path: root/chrome/browser/memory_details.cc
diff options
context:
space:
mode:
authorkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-30 18:00:47 +0000
committerkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-30 18:00:47 +0000
commitae5ca890de8d9f1a91f5198741c76f375146693b (patch)
treedd6d94c3396b76eb7d038252038cb7855edba716 /chrome/browser/memory_details.cc
parent9ddc35c7bb746eb974d99377c3c9313289b31eb1 (diff)
downloadchromium_src-ae5ca890de8d9f1a91f5198741c76f375146693b.zip
chromium_src-ae5ca890de8d9f1a91f5198741c76f375146693b.tar.gz
chromium_src-ae5ca890de8d9f1a91f5198741c76f375146693b.tar.bz2
Fixing the google browser name in about:memory page.
BUG=4928 TEST=Open about:memory page a see if the browser name of Google is what is expected. Review URL: http://codereview.chromium.org/159385 Patch from Thiago Farina <thiago.farina@gmail.com>. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22066 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/memory_details.cc')
-rw-r--r--chrome/browser/memory_details.cc26
1 files changed, 15 insertions, 11 deletions
diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc
index bbce3ce..fdf6231 100644
--- a/chrome/browser/memory_details.cc
+++ b/chrome/browser/memory_details.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/memory_details.h"
#include <psapi.h>
+#include "app/l10n_util.h"
#include "base/file_version_info.h"
#include "base/string_util.h"
#include "chrome/browser/browser_process.h"
@@ -14,22 +15,13 @@
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/common/child_process_host.h"
#include "chrome/common/url_constants.h"
+#include "grit/chromium_strings.h"
class RenderViewHostDelegate;
// Template of static data we use for finding browser process information.
// These entries must match the ordering for MemoryDetails::BrowserProcess.
-static ProcessData
- g_process_template[MemoryDetails::MAX_BROWSERS] = {
- { L"Chromium", L"chrome.exe", },
- { L"IE", L"iexplore.exe", },
- { L"Firefox", L"firefox.exe", },
- { L"Opera", L"opera.exe", },
- { L"Safari", L"safari.exe", },
- { L"IE (64bit)", L"iexplore.exe", },
- { L"Konqueror", L"konqueror.exe", },
- };
-
+static ProcessData g_process_template[MemoryDetails::MAX_BROWSERS];
// About threading:
//
@@ -46,6 +38,18 @@ static ProcessData
MemoryDetails::MemoryDetails()
: ui_loop_(NULL) {
+ static const std::wstring google_browser_name =
+ l10n_util::GetString(IDS_PRODUCT_NAME);
+ ProcessData g_process_template[MemoryDetails::MAX_BROWSERS] = {
+ { google_browser_name.c_str(), L"chrome.exe", },
+ { L"IE", L"iexplore.exe", },
+ { L"Firefox", L"firefox.exe", },
+ { L"Opera", L"opera.exe", },
+ { L"Safari", L"safari.exe", },
+ { L"IE (64bit)", L"iexplore.exe", },
+ { L"Konqueror", L"konqueror.exe", },
+ };
+
for (int index = 0; index < arraysize(g_process_template); ++index) {
process_data_[index].name = g_process_template[index].name;
process_data_[index].process_name = g_process_template[index].process_name;