chrome/browser/chrome_browser_main.cc - Issue 10387010: 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/chrome_browser_main.cc

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

Patch Set: Convert ptr to bool for win compile. 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:

Index: chrome/browser/chrome_browser_main.cc

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

index 87d77dbe372f6ccd21b6de9447bf7c8dbab42897..4a9b6098b12eddbe00444151a9e52c2bb206517f 100644

--- a/chrome/browser/chrome_browser_main.cc

+++ b/chrome/browser/chrome_browser_main.cc

@@ -432,7 +432,7 @@ void InitializeGpuDataManager(const CommandLine& parsed_command_line) {

const base::StringPiece gpu_blacklist_json(

ResourceBundle::GetSharedInstance().GetRawDataResource(

- IDR_GPU_BLACKLIST));

+ IDR_GPU_BLACKLIST, ui::ResourceHandle::kScaleFactorNone));

GpuBlacklist* gpu_blacklist = GpuBlacklist::GetInstance();

bool succeed = gpu_blacklist->LoadGpuBlacklist(

gpu_blacklist_json.as_string(), GpuBlacklist::kCurrentOsOnly);