content/public/common/content_client.cc - Issue 1996723002: Switch ResourceBundle LoadDataResourceBytes to return RefCountedMemory.

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: content/public/common/content_client.cc

Issue 1996723002: Switch ResourceBundle LoadDataResourceBytes to return RefCountedMemory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update to address newly added use Created 4 years, 7 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: content/public/common/content_client.cc

diff --git a/content/public/common/content_client.cc b/content/public/common/content_client.cc

index 1291437caafffbbf81a60a8cc74f1b562c5871a9..4deed2d832cb07efa90df369c513cb16386df55a 100644

--- a/content/public/common/content_client.cc

+++ b/content/public/common/content_client.cc

@@ -92,9 +92,9 @@ base::StringPiece ContentClient::GetDataResource(

return base::StringPiece();

}

-base::RefCountedStaticMemory* ContentClient::GetDataResourceBytes(

+base::RefCountedMemory* ContentClient::GetDataResourceBytes(

int resource_id) const {

- return NULL;

+ return nullptr;

}

gfx::Image& ContentClient::GetNativeImageNamed(int resource_id) const {

« no previous file with comments | « content/public/common/content_client.h ('k') | content/shell/common/shell_content_client.h » ('j') | no next file with comments »