chrome/browser/memory_details.cc - Issue 7562001: Add memory usage info to SyslogsProvider, and clean up bug report screenshot data.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/memory_details.cc

Issue 7562001: Add memory usage info to SyslogsProvider, and clean up bug report screenshot data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Increase max entry size for stats included unzipped in feedback page. Created 9 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/memory_details.cc

diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc

index 3aacec55c3427adf83ea0ca22f0b3e41c5278e3a..60c6b47516bbd611ff9e970ec1aeb3177235f91c 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.

« no previous file with comments | « chrome/browser/chromeos/system/syslogs_provider.cc ('k') | chrome/browser/ui/webui/bug_report_ui.cc » ('j') | no next file with comments »