summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-02 16:33:24 +0000
committerjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-02 16:33:24 +0000
commit14cb2b2d60200c0f0cdd7d45b9d1bbcbd823207e (patch)
tree39e51f4bf66c712a8255352102c9124485e249e2 /chrome/common
parent5e7b858fa60f6b50df75a091d1fbbf6ddfae82f4 (diff)
downloadchromium_src-14cb2b2d60200c0f0cdd7d45b9d1bbcbd823207e.zip
chromium_src-14cb2b2d60200c0f0cdd7d45b9d1bbcbd823207e.tar.gz
chromium_src-14cb2b2d60200c0f0cdd7d45b9d1bbcbd823207e.tar.bz2
CrOS - Add memory consumption status bar widget behind flag
Pass --memory-widget on CrOS to get a real-time display, updated every 5 seconds, of the system's free memory. Tooltip and menu itself detail the data from /proc/meminfo. Also made base::GetSystemMemoryInfo() available on Linux systems to provide detailed data. BUG=chromium-os:18446 TEST=manual Review URL: http://codereview.chromium.org/7518010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95089 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/chrome_switches.cc3
-rw-r--r--chrome/common/chrome_switches.h1
2 files changed, 4 insertions, 0 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 6f61f46..4629dbc 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -1057,6 +1057,9 @@ const char kLoginScreen[] = "login-screen";
// Allows control over the initial login screen size. Pass width,height.
const char kLoginScreenSize[] = "login-screen-size";
+// Shows a memory consumption status area widget for OOM debugging.
+const char kMemoryWidget[] = "memory-widget";
+
// Attempts to load libcros and validate it, then exits. A nonzero return code
// means the library could not be loaded correctly.
const char kTestLoadLibcros[] = "test-load-libcros";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index b363b9e..f9d4f4f 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -291,6 +291,7 @@ extern const char kLoginManager[];
// purposes.
extern const char kLoginScreen[];
extern const char kLoginScreenSize[];
+extern const char kMemoryWidget[];
extern const char kTestLoadLibcros[];
extern const char kLoginProfile[];
extern const char kLoginUser[];