summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-28 00:58:41 +0000
committerrahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-28 00:58:41 +0000
commit1e1402c1e5399edaa536ca41d6d8ec1c0735539c (patch)
tree65b8b8302c77add0bfe65e70ff00523d74358a3e
parentb08de9cd2ea9c8412134843fb4520cbed9a21d71 (diff)
downloadchromium_src-1e1402c1e5399edaa536ca41d6d8ec1c0735539c.zip
chromium_src-1e1402c1e5399edaa536ca41d6d8ec1c0735539c.tar.gz
chromium_src-1e1402c1e5399edaa536ca41d6d8ec1c0735539c.tar.bz2
Change Chrome references to Chromium on about:memory page.
BUG=1296800 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1474 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/memory_details.cc2
-rw-r--r--chrome/browser/resources/about_memory.html6
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc
index ef64666..e235fe5 100644
--- a/chrome/browser/memory_details.cc
+++ b/chrome/browser/memory_details.cc
@@ -24,7 +24,7 @@ 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[] = {
- { L"Chrome", L"chrome.exe", },
+ { L"Chromium", L"chrome.exe", },
{ L"IE", L"iexplore.exe", },
{ L"Firefox", L"firefox.exe", },
{ L"Opera", L"opera.exe", },
diff --git a/chrome/browser/resources/about_memory.html b/chrome/browser/resources/about_memory.html
index 406a9d0..a12231e4 100644
--- a/chrome/browser/resources/about_memory.html
+++ b/chrome/browser/resources/about_memory.html
@@ -411,7 +411,7 @@ function enableHelpTooltips() {
Summary of memory used by currently active browsers.
For browsers which use multiple processes, memory reflects
aggregate memory used across all browser processes.<p>
- For chrome, processes used to to display diagnostics
+ For Chromium, processes used to to display diagnostics
information (such as this "about:memory") are excluded.
</p>
</div>
@@ -535,7 +535,7 @@ function enableHelpTooltips() {
<div class='help'>
<div>
<p>
- Details of memory usage for each of Chrome's processes.
+ Details of memory usage for each of Chromium's processes.
</p>
</div>
</div>
@@ -661,7 +661,7 @@ function enableHelpTooltips() {
<div>
<p>
This is an approximation. Conceptually, this is the total
- amount of in-memory pages for the entire logical Chrome
+ amount of in-memory pages for the entire logical Chromium
application, without double counting shared pages (e.g.
mapped
DLLs, SharedMemory bitmaps, etc.) across the browser and