Index: ui/gfx/display.cc |
diff --git a/ui/gfx/display.cc b/ui/gfx/display.cc |
index 5b375891ad0fa271aae4cc990c0f116a724eabc7..f305db28acdf6061e601cf5b897c827f99e8bc8f 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, uint32 serial_number) { |
int64 new_id = ((static_cast<int64>(manufacturer_id) << 32) | serial_number); |