diff options
Diffstat (limited to 'chromium/ui/views/mus/screen_mus.cc')
-rw-r--r-- | chromium/ui/views/mus/screen_mus.cc | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/chromium/ui/views/mus/screen_mus.cc b/chromium/ui/views/mus/screen_mus.cc index 8c8dd07f7e9..1238f81aefe 100644 --- a/chromium/ui/views/mus/screen_mus.cc +++ b/chromium/ui/views/mus/screen_mus.cc @@ -47,7 +47,7 @@ ScreenMus::~ScreenMus() { display::Screen::SetScreenInstance(nullptr); } -void ScreenMus::Init(service_manager::Connector* connector) { +void ScreenMus::InitDeprecated(service_manager::Connector* connector) { connector->BindInterface(ui::mojom::kServiceName, &screen_provider_); ui::mojom::ScreenProviderObserverPtr observer; @@ -72,28 +72,6 @@ void ScreenMus::Init(service_manager::Connector* connector) { } } -display::Display ScreenMus::GetDisplayNearestWindow( - gfx::NativeWindow window) const { - aura::WindowTreeHostMus* window_tree_host_mus = - aura::WindowTreeHostMus::ForWindow(window); - if (!window_tree_host_mus) - return GetPrimaryDisplay(); - return window_tree_host_mus->GetDisplay(); -} - -gfx::Point ScreenMus::GetCursorScreenPoint() { - return aura::Env::GetInstance()->last_mouse_location(); -} - -bool ScreenMus::IsWindowUnderCursor(gfx::NativeWindow window) { - return window && window->IsVisible() && - window->GetBoundsInScreen().Contains(GetCursorScreenPoint()); -} - -aura::Window* ScreenMus::GetWindowAtScreenPoint(const gfx::Point& point) { - return delegate_->GetWindowAtScreenPoint(point); -} - void ScreenMus::OnDisplaysChanged( std::vector<ui::mojom::WsDisplayPtr> ws_displays, int64_t primary_display_id, @@ -154,4 +132,26 @@ void ScreenMus::OnDisplaysChanged( } } +display::Display ScreenMus::GetDisplayNearestWindow( + gfx::NativeWindow window) const { + aura::WindowTreeHostMus* window_tree_host_mus = + aura::WindowTreeHostMus::ForWindow(window); + if (!window_tree_host_mus) + return GetPrimaryDisplay(); + return window_tree_host_mus->GetDisplay(); +} + +gfx::Point ScreenMus::GetCursorScreenPoint() { + return aura::Env::GetInstance()->last_mouse_location(); +} + +bool ScreenMus::IsWindowUnderCursor(gfx::NativeWindow window) { + return window && window->IsVisible() && + window->GetBoundsInScreen().Contains(GetCursorScreenPoint()); +} + +aura::Window* ScreenMus::GetWindowAtScreenPoint(const gfx::Point& point) { + return delegate_->GetWindowAtScreenPoint(point); +} + } // namespace views |