diff options
author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-04 22:26:03 +0000 |
---|---|---|
committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-04 22:26:03 +0000 |
commit | 7dcac98e5b38a32ac69c75ff16af6b6b1ee46494 (patch) | |
tree | af19dbd73aae069a5db0f1bc4824e87c663ab8ac /chrome/browser/resources | |
parent | 3ee84160f356ad78f48639b4e26eebee9a88b9c1 (diff) | |
download | chromium_src-7dcac98e5b38a32ac69c75ff16af6b6b1ee46494.zip chromium_src-7dcac98e5b38a32ac69c75ff16af6b6b1ee46494.tar.gz chromium_src-7dcac98e5b38a32ac69c75ff16af6b6b1ee46494.tar.bz2 |
Linux: use /proc/pid/statm to get memory stats when /proc/pid/smaps is unavailable.
BUG=23258
TEST=We get approximate memory usage in about:memory for sandboxed renderers.
Review URL: http://codereview.chromium.org/365007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31019 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources')
-rw-r--r-- | chrome/browser/resources/about_memory_linux.html | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/resources/about_memory_linux.html b/chrome/browser/resources/about_memory_linux.html index 31dfa3e..70c92de 100644 --- a/chrome/browser/resources/about_memory_linux.html +++ b/chrome/browser/resources/about_memory_linux.html @@ -409,11 +409,11 @@ function enableHelpTooltips() { <div class='help'> <div> <p> - 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 Chromium, processes used to to display diagnostics - information (such as this "about:memory") are excluded. + 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 Chromium, processes used to to display diagnostics + information (such as this "about:memory") are excluded. </p> </div> </div> @@ -490,7 +490,7 @@ function enableHelpTooltips() { <div class='help'> <div> <p> - Details of memory usage for each of Chromium's processes. + Details of memory usage for each of Chromium's processes. </p> </div> </div> @@ -580,7 +580,7 @@ function enableHelpTooltips() { </tr> </table> - <div class="otherbrowsers">(We cannot get the memory usage of our renderer processes when they are sandboxed, which is why they may be missing from the list above <a href="http://crbug.com/23258">[bug]</a>.)</div> + <div class="otherbrowsers">(The memory usage of our renderer processes is slightly less accurate when they are sandboxed.)</div> </div> </body> |