Simplify calls for scale factor

ui/base/layout_mac.mm

Index: ui/base/layout_mac.mm
diff --git a/ui/base/layout_mac.mm b/ui/base/layout_mac.mm
index 27e12e1fa095c49b78ea5e0355e7b30510e2dfd0..472275d6a87ab6d09680f60b7d08fd5cd6689d60 100644
--- a/ui/base/layout_mac.mm
+++ b/ui/base/layout_mac.mm
@@ -4,9 +4,10 @@
 
 #include "ui/base/layout.h"
 
-#include <Cocoa/Cocoa.h>
-
 #include "base/mac/sdk_forward_declarations.h"
+#include "ui/display/display.h"
+
+#include <Cocoa/Cocoa.h>

[tapted, 2017/03/13 01:47:01]

nit: this should appear between layout.h and sdk_forward_declarations.h with a
blank line on both sides. (also it should be #import instead of #include)

[Jinsuk Kim, 2017/03/13 01:58:21]

Done.

 
 namespace {
 
@@ -28,6 +29,8 @@ float GetScaleFactorScaleForNativeView(gfx::NativeView view) {
 namespace ui {
 
 float GetScaleFactorForNativeView(gfx::NativeView view) {
+  if (display::Display::HasForceDeviceScaleFactor())
+    return display::Display::GetForcedDeviceScaleFactor();
   return GetScaleFactorScaleForNativeView(view);
 }