| Index: ui/gfx/display.cc
|
| diff --git a/ui/gfx/display.cc b/ui/gfx/display.cc
|
| index 2a3f10ca2c7a9eadb2db09002017331d140eb149..40608a1d21127d265463131cb069199d6015942b 100644
|
| --- a/ui/gfx/display.cc
|
| +++ b/ui/gfx/display.cc
|
| @@ -9,20 +9,21 @@
|
| #include "base/string_number_conversions.h"
|
| #include "base/stringprintf.h"
|
| #include "ui/base/ui_base_switches.h"
|
| +#include "ui/base/win/dpi.h"
|
| #include "ui/gfx/insets.h"
|
| #include "ui/gfx/size_conversions.h"
|
|
|
| namespace gfx {
|
| namespace {
|
|
|
| -bool HasForceDeviceScaleFactor() {
|
| +bool HasForceDeviceScaleFactorImpl() {
|
| return CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kForceDeviceScaleFactor);
|
| }
|
|
|
| float GetForcedDeviceScaleFactorImpl() {
|
| double scale_in_double = 1.0;
|
| - if (HasForceDeviceScaleFactor()) {
|
| + if (HasForceDeviceScaleFactorImpl()) {
|
| std::string value = CommandLine::ForCurrentProcess()->
|
| GetSwitchValueASCII(switches::kForceDeviceScaleFactor);
|
| if (!base::StringToDouble(value, &scale_in_double))
|
| @@ -42,6 +43,11 @@ float Display::GetForcedDeviceScaleFactor() {
|
| return kForcedDeviceScaleFactor;
|
| }
|
|
|
| +//static
|
| +bool Display::HasForceDeviceScaleFactor() {
|
| + return HasForceDeviceScaleFactorImpl();
|
| +}
|
| +
|
| // static
|
| int64 Display::GetID(uint16 manufacturer_id,
|
| uint16 product_code,
|
|
|