chrome/browser/ui/webui/ntp/new_tab_ui.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: chrome/browser/ui/webui/ntp/new_tab_ui.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: chrome/browser/ui/webui/ntp/new_tab_ui.cc

diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.cc b/chrome/browser/ui/webui/ntp/new_tab_ui.cc

index ae162b625f074fa71f7a6b860f21e89decdfb9b9..9ba293d3cb3372f08e31216e3fa543fd6b6e262b 100644

--- a/chrome/browser/ui/webui/ntp/new_tab_ui.cc

+++ b/chrome/browser/ui/webui/ntp/new_tab_ui.cc

@@ -187,7 +187,7 @@ void NewTabUI::NewTabHTMLSource::StartDataRequest(

std::map<std::string, std::pair<std::string, int> >::iterator it =

resource_map_.find(path);

if (it != resource_map_.end()) {

- scoped_refptr<base::RefCountedStaticMemory> resource_bytes(

+ scoped_refptr<base::RefCountedMemory> resource_bytes(

it->second.second ?

ResourceBundle::GetSharedInstance().LoadDataResourceBytes(

it->second.second) :

« no previous file with comments | « chrome/browser/search/local_ntp_source.cc ('k') | chrome/common/chrome_content_client.h » ('j') | no next file with comments »