| Index: ui/aura/mus/window_tree_client.cc
|
| diff --git a/ui/aura/mus/window_tree_client.cc b/ui/aura/mus/window_tree_client.cc
|
| index 3574d71869b49e99c77187a926118eda7c4e9e75..f412897694fee649e8691afe317346f5e40dee5c 100644
|
| --- a/ui/aura/mus/window_tree_client.cc
|
| +++ b/ui/aura/mus/window_tree_client.cc
|
| @@ -43,8 +43,8 @@
|
| #include "ui/aura/window.h"
|
| #include "ui/aura/window_delegate.h"
|
| #include "ui/aura/window_tracker.h"
|
| +#include "ui/base/layout.h"
|
| #include "ui/base/ui_base_types.h"
|
| -#include "ui/display/display.h"
|
| #include "ui/display/screen.h"
|
| #include "ui/events/event.h"
|
| #include "ui/gfx/geometry/dip_util.h"
|
| @@ -140,9 +140,7 @@ void SetWindowTypeFromProperties(
|
| // Helper function to get the device_scale_factor() of the display::Display
|
| // nearest to |window|.
|
| float ScaleFactorForDisplay(Window* window) {
|
| - return display::Screen::GetScreen()
|
| - ->GetDisplayNearestWindow(window)
|
| - .device_scale_factor();
|
| + return ui::GetScaleFactorForNativeView(window);
|
| }
|
|
|
| void ConvertEventLocationToDip(int64_t display_id, ui::LocatedEvent* event) {
|
|
|