summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authoryutak@chromium.org <yutak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-19 22:22:58 +0000
committeryutak@chromium.org <yutak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-19 22:22:58 +0000
commitcec1217e4e67794cf7c70c070dcc69135e38446a (patch)
tree0dd5a887184f729e247afb631c179ca233f90e54 /chrome
parentd0da9737869b396f92ef56060e74e1b19ce5c17d (diff)
downloadchromium_src-cec1217e4e67794cf7c70c070dcc69135e38446a.zip
chromium_src-cec1217e4e67794cf7c70c070dcc69135e38446a.tar.gz
chromium_src-cec1217e4e67794cf7c70c070dcc69135e38446a.tar.bz2
Let Konqueror recognized in about:memory.
Landing a patch written by myself, which is originally reviewed at <http://codereview.chromium.org/113489>. BUG=7633 Review URL: http://codereview.chromium.org/115524 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16422 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/memory_details.cc1
-rw-r--r--chrome/browser/memory_details.h1
-rw-r--r--chrome/browser/resources/about_memory.html2
3 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc
index eae7f73..bbce3ce 100644
--- a/chrome/browser/memory_details.cc
+++ b/chrome/browser/memory_details.cc
@@ -27,6 +27,7 @@ static ProcessData
{ L"Opera", L"opera.exe", },
{ L"Safari", L"safari.exe", },
{ L"IE (64bit)", L"iexplore.exe", },
+ { L"Konqueror", L"konqueror.exe", },
};
diff --git a/chrome/browser/memory_details.h b/chrome/browser/memory_details.h
index ddf5280..8876c47 100644
--- a/chrome/browser/memory_details.h
+++ b/chrome/browser/memory_details.h
@@ -79,6 +79,7 @@ class MemoryDetails : public base::RefCountedThreadSafe<MemoryDetails> {
OPERA_BROWSER,
SAFARI_BROWSER,
IE_64BIT_BROWSER,
+ KONQUEROR_BROWSER,
MAX_BROWSERS
} BrowserProcess;
diff --git a/chrome/browser/resources/about_memory.html b/chrome/browser/resources/about_memory.html
index 08f24ce..a06002f 100644
--- a/chrome/browser/resources/about_memory.html
+++ b/chrome/browser/resources/about_memory.html
@@ -527,7 +527,7 @@ function enableHelpTooltips() {
</tr>
</table>
<div class=otherbrowsers jsdisplay="browsers.length == 1">
- Note: If other browsers (IE, Firefox, Opera, Safari) are running,
+ Note: If other browsers (e.g. IE, Firefox, Safari) are running,
I'll show their memory details here.
</div>