summaryrefslogtreecommitdiffstats
path: root/base/process_util.h
diff options
context:
space:
mode:
authorjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-01 23:51:17 +0000
committerjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-01 23:51:17 +0000
commitae9f26cada993a1f38878e0194de6d9925c0249f (patch)
tree82fce08d1dda17d0514a5649411362b760b55244 /base/process_util.h
parent327fda2054ff1642aab71f5edd88af46b896fd54 (diff)
downloadchromium_src-ae9f26cada993a1f38878e0194de6d9925c0249f.zip
chromium_src-ae9f26cada993a1f38878e0194de6d9925c0249f.tar.gz
chromium_src-ae9f26cada993a1f38878e0194de6d9925c0249f.tar.bz2
Revert 94999 - 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 TBR=jamescook@chromium.org Review URL: http://codereview.chromium.org/7544033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95004 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/process_util.h')
-rw-r--r--base/process_util.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/base/process_util.h b/base/process_util.h
index 5f88c62..3d9b7d1 100644
--- a/base/process_util.h
+++ b/base/process_util.h
@@ -653,14 +653,7 @@ class BASE_API ProcessMetrics {
DISALLOW_COPY_AND_ASSIGN(ProcessMetrics);
};
-#if defined(OS_LINUX)
-// Retrieves data from /proc/meminfo about system-wide memory consumption.
-// Values are in KB. Returns true on success.
-BASE_API bool GetSystemMemoryInfo(int* total_kb, int* free_kb, int* buffers_kb,
- int* cache_kb, int* shmem_kb);
-#endif
-
-// Returns the memory committed by the system in KBytes.
+// Returns the memory commited by the system in KBytes.
// Returns 0 if it can't compute the commit charge.
BASE_API size_t GetSystemCommitCharge();