diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-20 14:17:47 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-07-10 10:26:38 +0200 |
commit | 9cfde2edf4736ae9533e7e1fac495a23ad905419 (patch) | |
tree | 4eca639f54719a8824a527ee6a40fb13b462b110 /src/core/content_browser_client_qt.h | |
parent | 0a01998411de6a46af8d0b0ae13b8f401cd14a4b (diff) |
Adaptations for Chromium 75
Change-Id: Idad08244e0c749a9f70f5eb9f8cd236039b941b3
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/core/content_browser_client_qt.h')
-rw-r--r-- | src/core/content_browser_client_qt.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/core/content_browser_client_qt.h b/src/core/content_browser_client_qt.h index ac575c2a8..7f31b7c85 100644 --- a/src/core/content_browser_client_qt.h +++ b/src/core/content_browser_client_qt.h @@ -89,7 +89,7 @@ public: void ResourceDispatcherHostCreated() override; gl::GLShareGroup* GetInProcessGpuShareGroup() override; content::MediaObserver* GetMediaObserver() override; - content::QuotaPermissionContext *CreateQuotaPermissionContext() override; + scoped_refptr<content::QuotaPermissionContext> CreateQuotaPermissionContext() override; void GetQuotaSettings(content::BrowserContext *context, content::StoragePartition *partition, storage::OptionalQuotaSettingsCallback callback) override; @@ -108,7 +108,7 @@ public: std::unique_ptr<content::ClientCertificateDelegate> delegate) override; std::unique_ptr<net::ClientCertStore> CreateClientCertStore(content::ResourceContext *resource_context) override; content::DevToolsManagerDelegate *GetDevToolsManagerDelegate() override; - content::PlatformNotificationService *GetPlatformNotificationService() override; + content::PlatformNotificationService * GetPlatformNotificationService(content::BrowserContext *browser_context) override; std::string GetApplicationLocale() override; std::string GetAcceptLangs(content::BrowserContext* context) override; @@ -186,9 +186,9 @@ public: #endif std::unique_ptr<content::LoginDelegate> CreateLoginDelegate( - net::AuthChallengeInfo *auth_info, + const net::AuthChallengeInfo &auth_info, content::WebContents *web_contents, - const content::GlobalRequestID &request_id, + const content::GlobalRequestID& request_id, bool is_request_for_main_frame, const GURL &url, scoped_refptr<net::HttpResponseHeaders> response_headers, @@ -203,7 +203,9 @@ public: ui::PageTransition page_transition, bool has_user_gesture, const std::string &method, - const net::HttpRequestHeaders &headers) override; + const net::HttpRequestHeaders &headers, + network::mojom::URLLoaderFactoryRequest *factory_request, + network::mojom::URLLoaderFactory *&out_factory) override; static std::string getUserAgent(); @@ -216,7 +218,6 @@ private: BrowserMainPartsQt* m_browserMainParts; std::unique_ptr<content::ResourceDispatcherHostDelegate> m_resourceDispatcherHostDelegate; - std::unique_ptr<content::PlatformNotificationService> m_platformNotificationService; scoped_refptr<ShareGroupQtQuick> m_shareGroupQtQuick; std::unique_ptr<service_manager::BinderRegistry> m_frameInterfaces; std::unique_ptr<service_manager::BinderRegistryWithArgs<content::RenderFrameHost*>> m_frameInterfacesParameterized; |