Index: ui/base/layout_mac.mm |
diff --git a/ui/base/layout_mac.mm b/ui/base/layout_mac.mm |
index 70ece0ab4924e0d4b3032a227af8e373fb7a42ff..f210eee25eff6f840e9f426b32937a59c411b738 100644 |
--- a/ui/base/layout_mac.mm |
+++ b/ui/base/layout_mac.mm |
@@ -27,18 +27,20 @@ std::vector<ui::ScaleFactor>& GetSupportedScaleFactorsInternal() { |
} |
float GetScaleFactorScaleForNativeView(gfx::NativeView view) { |
- float scale_factor = 1.0f; |
if (NSWindow* window = [view window]) { |
if ([window respondsToSelector:@selector(backingScaleFactor)]) |
return [window backingScaleFactor]; |
- scale_factor = [window userSpaceScaleFactor]; |
+ return [window userSpaceScaleFactor]; |
} |
- if (NSScreen* screen = [NSScreen mainScreen]) { |
- if ([screen respondsToSelector:@selector(backingScaleFactor)]) |
- return [screen backingScaleFactor]; |
- return [screen userSpaceScaleFactor]; |
- } |
- return 1.0f; |
+ |
+ NSArray* screens = [NSScreen screens]; |
+ if (![screens count]) |
+ return 1.0f; |
+ |
+ NSScreen* screen = [screens objectAtIndex:0]; |
+ if ([screen respondsToSelector:@selector(backingScaleFactor)]) |
+ return [screen backingScaleFactor]; |
+ return [screen userSpaceScaleFactor]; |
} |
} // namespace |