From 33ccd9b9e5ffbae49652e1275c09973907fb282a Mon Sep 17 00:00:00 2001
From: Samuel Attard <samuel.r.attard@gmail.com>
Date: Mon, 16 Aug 2021 22:39:30 +0000
Subject: [PATCH 1/2] fix: handle nullish WebContentsView in
 UpdateDraggableRegions

---
 shell/browser/api/electron_api_browser_window_views.cc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/shell/browser/api/electron_api_browser_window_views.cc b/shell/browser/api/electron_api_browser_window_views.cc
index a43b42814f236..bda49ec843a9b 100644
--- a/shell/browser/api/electron_api_browser_window_views.cc
+++ b/shell/browser/api/electron_api_browser_window_views.cc
@@ -4,6 +4,7 @@
 
 #include "shell/browser/api/electron_api_browser_window.h"
 
+#include "content/browser/web_contents/web_contents_impl.h"
 #include "shell/browser/native_window_views.h"
 #include "ui/aura/window.h"
 
@@ -17,8 +18,10 @@ void BrowserWindow::UpdateDraggableRegions(
     return;
 
   if (&draggable_regions_ != &regions) {
-    auto* nv = web_contents()->GetNativeView();
-    if (nv) {
+    auto* view =
+        static_cast<content::WebContentsImpl*>(web_contents())->GetView();
+    if (view) {
+      const gfx::NativeView nv = view->GetNativeView();
       auto const offset = nv->GetBoundsInRootWindow();
       auto snapped_regions = mojo::Clone(regions);
       for (auto& snapped_region : snapped_regions) {

From 7ed9e5066ff07c8996f6b37d4f6881ad6387e151 Mon Sep 17 00:00:00 2001
From: Samuel Attard <samuel.r.attard@gmail.com>
Date: Tue, 17 Aug 2021 00:00:32 +0000
Subject: [PATCH 2/2] build: nogncheck on webcontentsimpl include

---
 shell/browser/api/electron_api_browser_window_views.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/browser/api/electron_api_browser_window_views.cc b/shell/browser/api/electron_api_browser_window_views.cc
index bda49ec843a9b..fb96705ee32a7 100644
--- a/shell/browser/api/electron_api_browser_window_views.cc
+++ b/shell/browser/api/electron_api_browser_window_views.cc
@@ -4,7 +4,7 @@
 
 #include "shell/browser/api/electron_api_browser_window.h"
 
-#include "content/browser/web_contents/web_contents_impl.h"
+#include "content/browser/web_contents/web_contents_impl.h"  // nogncheck
 #include "shell/browser/native_window_views.h"
 #include "ui/aura/window.h"