summaryrefslogtreecommitdiffstats
path: root/src/core/content_browser_client_qt.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-05-03 18:46:06 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-06-26 08:17:25 +0000
commit57c49df9c6fcbaaffc66900e191312d4e0a0edfa (patch)
treea067be82e9c367673b3f8efdbcf0a21a780b5451 /src/core/content_browser_client_qt.h
parent8d752cab84d437244ef0c2318b70d6516e99a044 (diff)
Adaptations for Chromium 66
Change-Id: Iee88721a50036d4ef85a23dd1708d4fb84218708 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core/content_browser_client_qt.h')
-rw-r--r--src/core/content_browser_client_qt.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/core/content_browser_client_qt.h b/src/core/content_browser_client_qt.h
index 8c7079e62..4c1d4990c 100644
--- a/src/core/content_browser_client_qt.h
+++ b/src/core/content_browser_client_qt.h
@@ -86,7 +86,8 @@ public:
ContentBrowserClientQt();
~ContentBrowserClientQt();
content::BrowserMainParts* CreateBrowserMainParts(const content::MainFunctionParams&) override;
- void RenderProcessWillLaunch(content::RenderProcessHost* host) override;
+ void RenderProcessWillLaunch(content::RenderProcessHost *host,
+ service_manager::mojom::ServiceRequest* service_request) override;
void ResourceDispatcherHostCreated() override;
gl::GLShareGroup* GetInProcessGpuShareGroup() override;
content::MediaObserver* GetMediaObserver() override;
@@ -119,6 +120,7 @@ public:
const std::string& interface_name,
mojo::ScopedMessagePipeHandle interface_pipe) override;
void RegisterInProcessServices(StaticServiceMap* services) override;
+ std::vector<ServiceManifestInfo> GetExtraServiceManifests() override;
std::unique_ptr<base::Value> GetServiceManifestOverlay(base::StringPiece name) override;
bool CanCreateWindow(
content::RenderFrameHost* opener,
@@ -179,6 +181,14 @@ public:
void DidCreatePpapiPlugin(content::BrowserPpapiHost* browser_host) override;
#endif
+ content::ResourceDispatcherHostLoginDelegate *CreateLoginDelegate(
+ net::AuthChallengeInfo *auth_info,
+ content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
+ bool is_main_frame,
+ const GURL &url,
+ bool first_auth_attempt,
+ const base::Callback<void(const base::Optional<net::AuthCredentials>&)>&auth_required_callback) override;
+
private:
void InitFrameInterfaces();
BrowserMainPartsQt* m_browserMainParts;