chrome/browser/ui/webui/shared_resources_data_source.cc - Issue 10412004: Revert "Revert 137734 - Select theme resources from ResourceBundle at requested scale factor."

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/shared_resources_data_source.cc

Issue 10412004: Revert "Revert 137734 - Select theme resources from ResourceBundle at requested scale factor." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge with master Created 8 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/shared_resources_data_source.cc

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

index 378b8e3d37c0b53f25a419481183d23ae0fc0991..2d6630bc56eec7fe75a38131f226ea1247b05376 100644

--- a/chrome/browser/ui/webui/shared_resources_data_source.cc

+++ b/chrome/browser/ui/webui/shared_resources_data_source.cc

@@ -76,7 +76,7 @@ void SharedResourcesDataSource::StartDataRequest(const std::string& path,

DCHECK_NE(-1, idr) << " path: " << path;

const ResourceBundle& rb = ResourceBundle::GetSharedInstance();

scoped_refptr<base::RefCountedStaticMemory> bytes(

- rb.LoadDataResourceBytes(idr));

+ rb.LoadDataResourceBytes(idr, ui::SCALE_FACTOR_NONE));

SendResponse(request_id, bytes);

}

« no previous file with comments | « chrome/browser/ui/webui/sessions_ui.cc ('k') | chrome/browser/ui/webui/theme_source.h » ('j') | no next file with comments »