ui/aura/monitor_manager.cc - Issue 10546158: Remove --default-device-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/aura/monitor_manager.cc

Issue 10546158: Remove --default-device-scale-factor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 8 years, 6 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/aura/monitor_manager.cc

diff --git a/ui/aura/monitor_manager.cc b/ui/aura/monitor_manager.cc

index 206a5c6bf6f3228fa790f097e842feea59bc377e..9d12e8049e5abdf5c7e662cdbe44348b9e189579 100644

--- a/ui/aura/monitor_manager.cc

+++ b/ui/aura/monitor_manager.cc

@@ -32,7 +32,7 @@ gfx::Display MonitorManager::CreateMonitorFromSpec(const std::string& spec) {

gfx::Rect bounds(kDefaultHostWindowX, kDefaultHostWindowY,

kDefaultHostWindowWidth, kDefaultHostWindowHeight);

int x = 0, y = 0, width, height;

- float scale = gfx::Display::GetDefaultDeviceScaleFactor();

+ float scale = 1.0f;

oshima 2012/06/14 00:58:42 this value will be ignored if --force-device-scale

if (sscanf(spec.c_str(), "%dx%d*%f", &width, &height, &scale) >= 2) {

bounds.set_size(gfx::Size(width, height));

} else if (sscanf(spec.c_str(), "%d+%d-%dx%d*%f", &x, &y, &width, &height,