diff options
| author | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-03 21:41:16 +0000 |
|---|---|---|
| committer | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-03 21:41:16 +0000 |
| commit | 9bb480ee427dda14ba9ab81669b510bd40615c42 (patch) | |
| tree | 8787dfd4b5900a73c7e9414167be080ce87f879a /chrome/browser/memory_details.cc | |
| parent | ab5fcc30ea46c1ed3f6fa399b68cf965076a19d2 (diff) | |
| download | chromium_src-9bb480ee427dda14ba9ab81669b510bd40615c42.zip chromium_src-9bb480ee427dda14ba9ab81669b510bd40615c42.tar.gz chromium_src-9bb480ee427dda14ba9ab81669b510bd40615c42.tar.bz2 | |
Add memory usage info to SyslogsProvider, and clean up bug report screenshot data.
BUG=chromium-os:18418
TEST=Ensure bug reporting and screenshots work, system info is only provided when option is checked, and system info includes "mem_usage" entry.
Review URL: http://codereview.chromium.org/7562001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95327 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/memory_details.cc')
| -rw-r--r-- | chrome/browser/memory_details.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc index 3aacec5..60c6b47 100644 --- a/chrome/browser/memory_details.cc +++ b/chrome/browser/memory_details.cc @@ -70,8 +70,9 @@ ProcessData& ProcessData::operator=(const ProcessData& rhs) { // expensive parts of this operation over on the file thread. // void MemoryDetails::StartFetch() { + // This might get called from the UI or FILE threads, but should not be + // getting called from the IO thread. DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::IO)); - DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::FILE)); // In order to process this request, we need to use the plugin information. // However, plugin process information is only available from the IO thread. |