ui/views/widget/desktop_aura/desktop_screen_win.cc - Issue 11829040: Fix the content_browsertests everywhere maybe.

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 11829040: Fix the content_browsertests everywhere maybe. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: And fix the final ExtensionApiTest.AlertBasic case. Created 7 years, 11 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 d22bddc26f435d0bb16cdfb4c4d159bf19487a42..f36475e1d00d603964e9e0f7b29359bd1e68782f 100644

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

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

@@ -52,7 +52,8 @@ gfx::Display DesktopScreenWin::GetDisplayMatching(

}

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

- return window->GetRootWindow()->GetAcceleratedWidget();

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

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

}

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