ui/base/resource/resource_bundle_win.cc - Issue 24175004: Remove dependency on ui::ScaleFactor from ui/gfx

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_win.cc

Issue 24175004: Remove dependency on ui::ScaleFactor from ui/gfx (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix new usage of scale in FastShowPickler Created 7 years, 3 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_win.cc

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

index 0a2b185e67e9445f2e8e82ae724dfbb1ba0ebcc5..cb99e209c3a73559cb3037c1d540556967ab219c 100644

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

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

@@ -44,7 +44,7 @@ void ResourceBundle::LoadCommonResources() {

// scaled up from 100% touch.

float scale = gfx::win::GetDeviceScaleFactor();

bool force_touch_resources = false;

- switch(ui::GetScaleFactorFromScale(scale)) {

+ switch(ui::GetSupportedScaleFactor(scale)) {

case ui::SCALE_FACTOR_180P:

AddDataPackFromPath(GetResourcesPakFilePath(

"chrome_touch_180_percent.pak"),

« no previous file with comments | « ui/base/resource/resource_bundle_unittest.cc ('k') | ui/base/x/x11_util.cc » ('j') | no next file with comments »