From 65909d55417c78e88308644dea30a65fae2d9c4a Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 15 Feb 2019 11:30:19 +0100 Subject: Remove hack with passing WebContentsAdapterClient as NativeView MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead delay creating our render view just a little bit further in WebContentImpl::OpenWindow until it calls delegate->WebContentsCreated() Change-Id: Idd911d208bbfe419a2567220933eccb2ba726347 Reviewed-by: Jüri Valdmann --- src/core/web_contents_view_qt.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/core/web_contents_view_qt.h') diff --git a/src/core/web_contents_view_qt.h b/src/core/web_contents_view_qt.h index c7bac1d97..7cd3910f2 100644 --- a/src/core/web_contents_view_qt.h +++ b/src/core/web_contents_view_qt.h @@ -65,7 +65,8 @@ public: , m_factoryClient(nullptr) { } - void initialize(WebContentsAdapterClient* client); + void setFactoryClient(WebContentsAdapterClient* client); + void setClient(WebContentsAdapterClient* client); WebContentsAdapterClient *client() { return m_client; } content::RenderWidgetHostViewBase *CreateViewForWidget(content::RenderWidgetHost* render_widget_host, bool is_guest_view_hack) override; @@ -86,9 +87,9 @@ public: gfx::NativeView GetNativeView() const override; - gfx::NativeView GetContentNativeView() const override { return 0; } + gfx::NativeView GetContentNativeView() const override { return nullptr; } - gfx::NativeWindow GetTopLevelNativeWindow() const override { return 0; } + gfx::NativeWindow GetTopLevelNativeWindow() const override { return nullptr; } void GetContainerBounds(gfx::Rect* out) const override; -- cgit v1.2.3