ui/views/widget/desktop_aura/desktop_screen_win.cc - Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/views/widget/desktop_aura/desktop_screen_win.cc

Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: ui/views/widget/desktop_aura/desktop_screen_win.cc

diff --git a/ui/views/widget/desktop_aura/desktop_screen_win.cc b/ui/views/widget/desktop_aura/desktop_screen_win.cc

index 93721bce353b5f4b4fe981c291d2347ac4119be1..f1a7767e47bd370b46d548514dc84e97bf8b8426 100644

--- a/ui/views/widget/desktop_aura/desktop_screen_win.cc

+++ b/ui/views/widget/desktop_aura/desktop_screen_win.cc

@@ -53,8 +53,8 @@ gfx::Display DesktopScreenWin::GetDisplayMatching(

}

HWND DesktopScreenWin::GetHWNDFromNativeView(gfx::NativeView window) const {

- aura::RootWindow* root_window = window->GetRootWindow();

- return root_window ? root_window->GetAcceleratedWidget() : NULL;

+ aura::WindowEventDispatcher* dispatcher = window->GetDispatcher();

+ return dispatcher ? dispatcher->GetAcceleratedWidget() : NULL;

}

gfx::NativeWindow DesktopScreenWin::GetNativeWindowFromHWND(HWND hwnd) const {