From 5f9e2f01e4eae22d9d40bb6b7767cde4cb94766e Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 21 Aug 2019 14:28:27 +0200 Subject: Adaptations for Chromium 77 Fixes: QTBUG-77267 Change-Id: I181e24cf80ebee6991b95dde6c636f0d169b40a4 Reviewed-by: Peter Varga --- src/core/profile_qt.cpp | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) (limited to 'src/core/profile_qt.cpp') diff --git a/src/core/profile_qt.cpp b/src/core/profile_qt.cpp index 19d54df62..94b22fbea 100644 --- a/src/core/profile_qt.cpp +++ b/src/core/profile_qt.cpp @@ -130,7 +130,7 @@ const PrefService* ProfileQt::GetPrefs() const return m_prefServiceAdapter.prefService(); } -base::FilePath ProfileQt::GetPath() const +base::FilePath ProfileQt::GetPath() { return toFilePath(m_profileAdapter->dataPath()); } @@ -140,7 +140,7 @@ base::FilePath ProfileQt::GetCachePath() const return toFilePath(m_profileAdapter->cachePath()); } -bool ProfileQt::IsOffTheRecord() const +bool ProfileQt::IsOffTheRecord() { return m_profileAdapter->isOffTheRecord(); } @@ -155,12 +155,6 @@ net::URLRequestContextGetter *ProfileQt::CreateMediaRequestContext() return m_urlRequestContextGetter.get(); } -net::URLRequestContextGetter *ProfileQt::CreateMediaRequestContextForStoragePartition(const base::FilePath&, bool) -{ - Q_UNIMPLEMENTED(); - return nullptr; -} - content::ResourceContext *ProfileQt::GetResourceContext() { return m_profileIOData->resourceContext(); @@ -234,9 +228,9 @@ net::URLRequestContextGetter *ProfileQt::CreateRequestContext( DCHECK_CURRENTLY_ON(content::BrowserThread::UI); DCHECK(!m_urlRequestContextGetter.get()); #if BUILDFLAG(ENABLE_EXTENSIONS) - extensions::InfoMap* extension_info_map = GetExtensionSystem()->info_map(); + extensions::InfoMap *extension_info_map = GetExtensionSystem()->info_map(); (*protocol_handlers)[extensions::kExtensionScheme] = - extensions::CreateExtensionProtocolHandler(IsOffTheRecord(),extension_info_map); + extensions::CreateExtensionProtocolHandler(IsOffTheRecord(), extension_info_map); #endif m_profileIOData->setRequestContextData(protocol_handlers, std::move(request_interceptors)); @@ -245,15 +239,6 @@ net::URLRequestContextGetter *ProfileQt::CreateRequestContext( return m_urlRequestContextGetter.get(); } -net::URLRequestContextGetter *ProfileQt::CreateRequestContextForStoragePartition( - const base::FilePath& partition_path, bool in_memory, - content::ProtocolHandlerMap* protocol_handlers, - content::URLRequestInterceptorScopedVector request_interceptors) -{ - Q_UNIMPLEMENTED(); - return nullptr; -} - content::ClientHintsControllerDelegate *ProfileQt::GetClientHintsControllerDelegate() { return nullptr; @@ -270,7 +255,7 @@ void ProfileQt::SetCorsOriginAccessListForOrigin(const url::Origin &source_origi std::move(closure)); } -const content::SharedCorsOriginAccessList *ProfileQt::GetSharedCorsOriginAccessList() const +content::SharedCorsOriginAccessList *ProfileQt::GetSharedCorsOriginAccessList() { return m_sharedCorsOriginAccessList.get(); } -- cgit v1.2.3