summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-07 17:32:53 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-07 17:32:53 +0000
commitf3f032f83ccb686cc5169647261982b797dd97b0 (patch)
tree07982e36887aa7786c63c7839f1cb023e2d46537
parent663f339a1197711e5a9b0f0f382920e529f4fb3e (diff)
downloadchromium_src-f3f032f83ccb686cc5169647261982b797dd97b0.zip
chromium_src-f3f032f83ccb686cc5169647261982b797dd97b0.tar.gz
chromium_src-f3f032f83ccb686cc5169647261982b797dd97b0.tar.bz2
Add Iceweasel to the list of browsers shown in about:memory.
BUG=44602 Based on a patch from Giuseppe Iuculano <giuseppe@iuculano.it>. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51730 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--AUTHORS1
-rw-r--r--chrome/browser/memory_details_linux.cc3
2 files changed, 4 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 9ac8049..a5a76f2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -79,3 +79,4 @@ Ningxin Hu <ningxin.hu@intel.com>
Jared Wein <weinjared@gmail.com>
Mingmin Xie <melvinxie@gmail.com>
Michael Gilbert <floppymaster@gmail.com>
+Giuseppe Iuculano <giuseppe@iuculano.it>
diff --git a/chrome/browser/memory_details_linux.cc b/chrome/browser/memory_details_linux.cc
index bc230f1..bca8a75 100644
--- a/chrome/browser/memory_details_linux.cc
+++ b/chrome/browser/memory_details_linux.cc
@@ -25,6 +25,7 @@
enum BrowserType {
CHROME = 0,
FIREFOX,
+ ICEWEASEL,
OPERA,
KONQUEROR,
EPIPHANY,
@@ -37,6 +38,7 @@ enum BrowserType {
static const char kBrowserPrettyNames[][10] = {
"Chrome",
"Firefox",
+ "Iceweasel",
"Opera",
"Konqueror",
"Epiphany",
@@ -52,6 +54,7 @@ static const struct {
{ "firefox-3.5", FIREFOX },
{ "firefox-3.0", FIREFOX },
{ "firefox-bin", FIREFOX },
+ { "iceweasel", ICEWEASEL },
{ "opera", OPERA },
{ "konqueror", KONQUEROR },
{ "epiphany-browse", EPIPHANY },