diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-02-23 17:11:05 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-27 09:13:09 +0000 |
commit | bce063054682e590e9fa8aa9d2ec19ca26ea3d49 (patch) | |
tree | 72eafcf4e0d2c6518ffd38772f7f5758bf6a4137 /src/core/renderer_host | |
parent | 817c117cf89f15e1877107597c8daeff956fd1a6 (diff) |
Adaptations for Chromium 56
Change-Id: I78240d7956de4716757761fc6517f031b4adb822
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/renderer_host')
-rw-r--r-- | src/core/renderer_host/resource_dispatcher_host_delegate_qt.cpp | 15 | ||||
-rw-r--r-- | src/core/renderer_host/resource_dispatcher_host_delegate_qt.h | 6 |
2 files changed, 11 insertions, 10 deletions
diff --git a/src/core/renderer_host/resource_dispatcher_host_delegate_qt.cpp b/src/core/renderer_host/resource_dispatcher_host_delegate_qt.cpp index 16a4e7265..afc2ea8fa 100644 --- a/src/core/renderer_host/resource_dispatcher_host_delegate_qt.cpp +++ b/src/core/renderer_host/resource_dispatcher_host_delegate_qt.cpp @@ -149,20 +149,23 @@ static void LaunchURL(const GURL& url, int render_process_id, contentsDelegate->launchExternalURL(toQt(url), page_transition, is_main_frame); } -bool ResourceDispatcherHostDelegateQt::HandleExternalProtocol(const GURL& url, int child_id, - const content::ResourceRequestInfo::WebContentsGetter& web_contents_getter, - bool is_main_frame, ui::PageTransition page_transition, bool has_user_gesture, - content::ResourceContext* /*resource_context*/) + +bool ResourceDispatcherHostDelegateQt::HandleExternalProtocol(const GURL& url, content::ResourceRequestInfo* info) { Q_ASSERT(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); // We don't want to launch external applications unless it is based on a user action - if (!has_user_gesture) + if (!info->HasUserGesture()) return false; content::BrowserThread::PostTask( content::BrowserThread::UI, FROM_HERE, - base::Bind(&LaunchURL, url, child_id, web_contents_getter, page_transition, is_main_frame)); + base::Bind(&LaunchURL, url, + info->GetChildID(), + info->GetWebContentsGetterForRequest(), + info->GetPageTransition(), + info->IsMainFrame()) + ); return true; } diff --git a/src/core/renderer_host/resource_dispatcher_host_delegate_qt.h b/src/core/renderer_host/resource_dispatcher_host_delegate_qt.h index 6690f9a0f..604499e9f 100644 --- a/src/core/renderer_host/resource_dispatcher_host_delegate_qt.h +++ b/src/core/renderer_host/resource_dispatcher_host_delegate_qt.h @@ -89,10 +89,8 @@ private: class ResourceDispatcherHostDelegateQt : public content::ResourceDispatcherHostDelegate { public: - bool HandleExternalProtocol(const GURL& url, int child_id, - const content::ResourceRequestInfo::WebContentsGetter& web_contents_getter, - bool is_main_frame, ui::PageTransition page_transition, bool has_user_gesture, - content::ResourceContext* resource_context) override; + bool HandleExternalProtocol(const GURL& url, + content::ResourceRequestInfo* info) override; virtual content::ResourceDispatcherHostLoginDelegate* CreateLoginDelegate(net::AuthChallengeInfo *authInfo, net::URLRequest *request) Q_DECL_OVERRIDE; }; |