76c5f5cc8a
In the GN build, libchromiumcontent is no longer a distinct library, but merely a container for a set of scripts and patches. Maintaining those patches in a separate repository is tedious and error-prone, so merge them into the main repo. Once this is merged and GN is the default way to build Electron, the libchromiumcontent repository can be archived.
13 lines
559 B
Diff
13 lines
559 B
Diff
diff --git a/ui/views/widget/desktop_aura/desktop_screen_win.cc b/ui/views/widget/desktop_aura/desktop_screen_win.cc
|
|
index f772f64..7d13f9f 100644
|
|
--- a/ui/views/widget/desktop_aura/desktop_screen_win.cc
|
|
+++ b/ui/views/widget/desktop_aura/desktop_screen_win.cc
|
|
@@ -32,6 +32,8 @@ display::Display DesktopScreenWin::GetDisplayMatching(
|
|
}
|
|
|
|
HWND DesktopScreenWin::GetHWNDFromNativeView(gfx::NativeView window) const {
|
|
+ if (!window)
|
|
+ return NULL;
|
|
aura::WindowTreeHost* host = window->GetHost();
|
|
return host ? host->GetAcceleratedWidget() : NULL;
|
|
}
|