Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(904)

Unified Diff: ui/views/mus/screen_mus.cc

Issue 2463753003: Changes ScreenMusDelegate::GetWindowAtScreenPoint to return aura::Window (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/mus/screen_mus.h ('k') | ui/views/mus/screen_mus_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/screen_mus.cc
diff --git a/ui/views/mus/screen_mus.cc b/ui/views/mus/screen_mus.cc
index a841211a61c4a60fee03954acff6a63a43030eb0..a7a05ba227598469e204bf3de8bdb9d52cda1090 100644
--- a/ui/views/mus/screen_mus.cc
+++ b/ui/views/mus/screen_mus.cc
@@ -81,17 +81,8 @@ bool ScreenMus::IsWindowUnderCursor(gfx::NativeWindow window) {
window->GetBoundsInScreen().Contains(GetCursorScreenPoint());
}
-gfx::NativeWindow ScreenMus::GetWindowAtScreenPoint(const gfx::Point& point) {
- aura::Window* aura_window = nullptr;
- ui::Window* ui_window = delegate_->GetWindowAtScreenPoint(point);
- if (ui_window) {
- NativeWidgetMus* nw_mus = NativeWidgetMus::GetForWindow(ui_window);
- if (nw_mus) {
- aura_window =
- static_cast<internal::NativeWidgetPrivate*>(nw_mus)->GetNativeView();
- }
- }
- return aura_window;
+aura::Window* ScreenMus::GetWindowAtScreenPoint(const gfx::Point& point) {
+ return delegate_->GetWindowAtScreenPoint(point);
}
void ScreenMus::OnDisplays(mojo::Array<ui::mojom::WsDisplayPtr> ws_displays,
« no previous file with comments | « ui/views/mus/screen_mus.h ('k') | ui/views/mus/screen_mus_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698