chrome/browser/themes/browser_theme_pack.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/themes/browser_theme_pack.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/themes/browser_theme_pack.cc

diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc

index a62807fe5c2ed7271814288abf33325b536c8ecf..6bbd6e99107430056ea94e0806ac2326b7cc41b4 100644

--- a/chrome/browser/themes/browser_theme_pack.cc

+++ b/chrome/browser/themes/browser_theme_pack.cc

@@ -385,7 +385,7 @@ scoped_refptr<BrowserThemePack> BrowserThemePack::BuildFromDataPack(

base::ThreadRestrictions::ScopedAllowIO allow_io;

scoped_refptr<BrowserThemePack> pack(new BrowserThemePack);

pack->data_pack_.reset(

- new ui::DataPack(ui::ResourceHandle::kScaleFactor100x));

+ new ui::DataPack(ui::SCALE_FACTOR_100P));

if (!pack->data_pack_->Load(path)) {

LOG(ERROR) << "Failed to load theme data pack.";

« no previous file with comments | « chrome/browser/ssl/ssl_blocking_page.cc ('k') | chrome/browser/themes/theme_service.cc » ('j') | no next file with comments »