| Index: ui/views/cocoa/bridged_native_widget.mm
|
| diff --git a/ui/views/cocoa/bridged_native_widget.mm b/ui/views/cocoa/bridged_native_widget.mm
|
| index 9907347c10abe27ff54d04e41ec00f428e41d92a..b79029c300d7f392699bb36439d9b13024ce2dd7 100644
|
| --- a/ui/views/cocoa/bridged_native_widget.mm
|
| +++ b/ui/views/cocoa/bridged_native_widget.mm
|
| @@ -19,16 +19,15 @@
|
| #include "ui/base/hit_test.h"
|
| #include "ui/base/ime/input_method.h"
|
| #include "ui/base/ime/input_method_factory.h"
|
| -#include "ui/display/display.h"
|
| -#include "ui/display/screen.h"
|
| +#include "ui/base/layout.h"
|
| #include "ui/gfx/geometry/dip_util.h"
|
| #import "ui/gfx/mac/coordinate_conversion.h"
|
| #import "ui/gfx/mac/nswindow_frame_controls.h"
|
| #import "ui/native_theme/native_theme_mac.h"
|
| #import "ui/views/cocoa/bridged_content_view.h"
|
| -#import "ui/views/cocoa/drag_drop_client_mac.h"
|
| #import "ui/views/cocoa/cocoa_mouse_capture.h"
|
| #import "ui/views/cocoa/cocoa_window_move_loop.h"
|
| +#import "ui/views/cocoa/drag_drop_client_mac.h"
|
| #include "ui/views/cocoa/tooltip_manager_mac.h"
|
| #import "ui/views/cocoa/views_nswindow_delegate.h"
|
| #import "ui/views/cocoa/widget_owner_nswindow_adapter.h"
|
| @@ -111,10 +110,7 @@ const int kResizeAreaCornerSize = 12;
|
| int kWindowPropertiesKey;
|
|
|
| float GetDeviceScaleFactorFromView(NSView* view) {
|
| - display::Display display =
|
| - display::Screen::GetScreen()->GetDisplayNearestWindow(view);
|
| - DCHECK(display.is_valid());
|
| - return display.device_scale_factor();
|
| + return ui::GetScaleFactorForNativeView(view);
|
| }
|
|
|
| // Returns true if bounds passed to window in SetBounds should be treated as
|
|
|