diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-16 09:59:13 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-20 10:28:53 +0000 |
| commit | 6c11fb357ec39bf087b8b632e2b1e375aef1b38b (patch) | |
| tree | c8315530db18a8ee566521c39ab8a6af4f72bc03 /chromium/components/guest_view/browser | |
| parent | 3ffaed019d0772e59d6cdb2d0d32fe4834c31f72 (diff) | |
| download | qtwebengine-chromium-6c11fb357ec39bf087b8b632e2b1e375aef1b38b.tar.gz | |
BASELINE: Update Chromium to 74.0.3729.159
Change-Id: I8d2497da544c275415aedd94dd25328d555de811
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/components/guest_view/browser')
3 files changed, 4 insertions, 2 deletions
diff --git a/chromium/components/guest_view/browser/guest_view_base.cc b/chromium/components/guest_view/browser/guest_view_base.cc index e1b85d3a9fa..1bf94187e29 100644 --- a/chromium/components/guest_view/browser/guest_view_base.cc +++ b/chromium/components/guest_view/browser/guest_view_base.cc @@ -7,6 +7,7 @@ #include <memory> #include <utility> +#include "base/bind.h" #include "base/lazy_instance.h" #include "base/macros.h" #include "base/strings/utf_string_conversions.h" @@ -548,7 +549,7 @@ void GuestViewBase::WillAttach(WebContents* embedder_web_contents, WillAttachToEmbedder(); if (content::GuestMode::IsCrossProcessFrameGuest(web_contents())) { - web_contents()->AttachToOuterWebContentsFrame( + owner_web_contents_->AttachInnerWebContents( base::WrapUnique<WebContents>(web_contents()), outer_contents_frame); // TODO(ekaramad): MimeHandlerViewGuest might not need this ACK // (https://crbug.com/659750). diff --git a/chromium/components/guest_view/browser/test_guest_view_manager.cc b/chromium/components/guest_view/browser/test_guest_view_manager.cc index e4b269e57f9..e81907e2cf1 100644 --- a/chromium/components/guest_view/browser/test_guest_view_manager.cc +++ b/chromium/components/guest_view/browser/test_guest_view_manager.cc @@ -54,7 +54,7 @@ void TestGuestViewManager::WaitForAllGuestsDeleted() { void TestGuestViewManager::WaitForLastGuestDeleted() { // Wait for the last guest that was created to be deleted. guest_web_contents_watchers_.back()->Wait(); -}; +} content::WebContents* TestGuestViewManager::WaitForSingleGuestCreated() { if (!GetNumGuestsActive()) { diff --git a/chromium/components/guest_view/browser/test_guest_view_manager.h b/chromium/components/guest_view/browser/test_guest_view_manager.h index 45424a946f8..53f73b61edf 100644 --- a/chromium/components/guest_view/browser/test_guest_view_manager.h +++ b/chromium/components/guest_view/browser/test_guest_view_manager.h @@ -9,6 +9,7 @@ #include <memory> +#include "base/bind.h" #include "base/gtest_prod_util.h" #include "base/macros.h" #include "components/guest_view/browser/guest_view_manager.h" |