ui/base/resource/resource_bundle_android.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: ui/base/resource/resource_bundle_android.cc

Issue 10387010: 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:

Index: ui/base/resource/resource_bundle_android.cc

diff --git a/ui/base/resource/resource_bundle_android.cc b/ui/base/resource/resource_bundle_android.cc

index d770d3e370d5035eb1eb1301d79ea0d974ae3425..b8d30d48f4d7e57dc423e25ebc3c303b6ce42e53 100644

--- a/ui/base/resource/resource_bundle_android.cc

+++ b/ui/base/resource/resource_bundle_android.cc

@@ -30,11 +30,11 @@ namespace ui {

void ResourceBundle::LoadCommonResources() {

AddDataPack(GetResourcesPakFilePath("chrome.pak"),

- ResourceHandle::kScaleFactor100x);

+ SCALE_FACTOR_100P);

AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"),

- ResourceHandle::kScaleFactor100x);

+ SCALE_FACTOR_100P);

AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"),

- ResourceHandle::kScaleFactor100x);

+ SCALE_FACTOR_100P);

}

gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {