Simplify calls for scale factor

ui/base/layout_mac.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/base/layout.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.

 
-#include "base/mac/sdk_forward_declarations.h"
-
 namespace {
 
 float GetScaleFactorScaleForNativeView(gfx::NativeView view) {
   if (NSWindow* window = [view window]) {
     return [window backingScaleFactor];
   }
 
   NSArray* screens = [NSScreen screens];
   if (![screens count])
     return 1.0f;
 
   NSScreen* screen = [screens objectAtIndex:0];
   return [screen backingScaleFactor];
 }
 
 }  // namespace
 
 namespace ui {
 
 float GetScaleFactorForNativeView(gfx::NativeView view) {
+  if (display::Display::HasForceDeviceScaleFactor())
+    return display::Display::GetForcedDeviceScaleFactor();
   return GetScaleFactorScaleForNativeView(view);
 }
 
 }  // namespace ui