BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

3 files changed, 12 insertions, 23 deletions

diff --git a/chromium/extensions/components/native_app_window/BUILD.gn b/chromium/extensions/components/native_app_window/BUILD.gn
index 4b55712387e..ddc3a2cdb10 100644
--- a/chromium/extensions/components/native_app_window/BUILD.gn
+++ b/chromium/extensions/components/native_app_window/BUILD.gn
@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/ui.gni")
 import("//extensions/buildflags/buildflags.gni")
 
 assert(enable_extensions,
@@ -21,7 +22,12 @@ static_library("native_app_window") {
     "//extensions/browser",
     "//extensions/common",
     "//skia",
-    "//ui/views",
-    "//ui/views/controls/webview",
   ]
+
+  if (toolkit_views) {
+    deps += [
+      "//ui/views",
+      "//ui/views/controls/webview",
+    ]
+  }
 }
diff --git a/chromium/extensions/components/native_app_window/native_app_window_views.cc b/chromium/extensions/components/native_app_window/native_app_window_views.cc
index bb91add0f04..7f61f12d5ee 100644
--- a/chromium/extensions/components/native_app_window/native_app_window_views.cc
+++ b/chromium/extensions/components/native_app_window/native_app_window_views.cc
@@ -38,6 +38,9 @@ void NativeAppWindowViews::Init(
       create_params.GetContentMaximumSize(gfx::Insets()));
   Observe(app_window_->web_contents());
 
+  web_view_ = AddChildView(std::make_unique<views::WebView>(nullptr));
+  web_view_->SetWebContents(app_window_->web_contents());
+
   widget_ = new views::Widget;
   widget_->AddObserver(this);
   InitializeWindow(app_window, create_params);
@@ -47,6 +50,7 @@ void NativeAppWindowViews::Init(
 
 NativeAppWindowViews::~NativeAppWindowViews() {
   web_view_->SetWebContents(nullptr);
+  CHECK(!IsInObserverList());
 }
 
 void NativeAppWindowViews::OnCanHaveAlphaEnabledChanged() {
@@ -212,14 +216,6 @@ void NativeAppWindowViews::DeleteDelegate() {
   app_window_->OnNativeClose();
 }
 
-views::Widget* NativeAppWindowViews::GetWidget() {
-  return widget_;
-}
-
-const views::Widget* NativeAppWindowViews::GetWidget() const {
-  return widget_;
-}
-
 bool NativeAppWindowViews::ShouldDescendIntoChildForEventHandling(
     gfx::NativeView child,
     const gfx::Point& location) {
@@ -282,15 +278,6 @@ void NativeAppWindowViews::RenderViewHostChanged(
 
 // views::View implementation.
 
-void NativeAppWindowViews::ViewHierarchyChanged(
-    const views::ViewHierarchyChangedDetails& details) {
-  if (details.is_add && details.child == this) {
-    DCHECK(!web_view_);
-    web_view_ = AddChildView(std::make_unique<views::WebView>(nullptr));
-    web_view_->SetWebContents(app_window_->web_contents());
-  }
-}
-
 gfx::Size NativeAppWindowViews::GetMinimumSize() const {
   return size_constraints_.GetMinimumSize();
 }
diff --git a/chromium/extensions/components/native_app_window/native_app_window_views.h b/chromium/extensions/components/native_app_window/native_app_window_views.h
index 360f1d53402..db06ef02eec 100644
--- a/chromium/extensions/components/native_app_window/native_app_window_views.h
+++ b/chromium/extensions/components/native_app_window/native_app_window_views.h
@@ -99,8 +99,6 @@ class NativeAppWindowViews : public extensions::NativeAppWindow,
   void SaveWindowPlacement(const gfx::Rect& bounds,
                            ui::WindowShowState show_state) override;
   void DeleteDelegate() override;
-  views::Widget* GetWidget() override;
-  const views::Widget* GetWidget() const override;
   bool ShouldDescendIntoChildForEventHandling(
       gfx::NativeView child,
       const gfx::Point& location) override;
@@ -116,8 +114,6 @@ class NativeAppWindowViews : public extensions::NativeAppWindow,
                              content::RenderViewHost* new_host) override;
 
   // views::View:
-  void ViewHierarchyChanged(
-      const views::ViewHierarchyChangedDetails& details) override;
   gfx::Size GetMinimumSize() const override;
   gfx::Size GetMaximumSize() const override;
   void OnBoundsChanged(const gfx::Rect& previous_bounds) override;