diff options
author | Andras Becsi <andras.becsi@theqtcompany.com> | 2014-12-01 13:24:25 +0100 |
---|---|---|
committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2014-12-01 14:28:00 +0100 |
commit | 9316b8c27c4d63ee755517fb4670268424200b3c (patch) | |
tree | a9818fd5a8798ec56add7cd622fb13cee525557a /src/core/content_browser_client_qt.cpp | |
parent | ad46ffd2e74b17cd7e7b8a7d73590696cc8febce (diff) | |
parent | 03a52863226aeb774721db610ba831808b30836a (diff) |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/core/access_token_store_qt.cpp
src/core/access_token_store_qt.h
src/core/content_browser_client_qt.cpp
Change-Id: Id319ad0d87ce071e63d9c6c22b4fc35523ddfa74
Diffstat (limited to 'src/core/content_browser_client_qt.cpp')
-rw-r--r-- | src/core/content_browser_client_qt.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp index 2ebd3cfad..1c0c75bad 100644 --- a/src/core/content_browser_client_qt.cpp +++ b/src/core/content_browser_client_qt.cpp @@ -66,6 +66,7 @@ #include "media_capture_devices_dispatcher.h" #include "resource_dispatcher_host_delegate_qt.h" #include "web_contents_delegate_qt.h" +#include "access_token_store_qt.h" #include <QGuiApplication> #include <QOpenGLContext> @@ -336,13 +337,6 @@ content::MediaObserver *ContentBrowserClientQt::GetMediaObserver() return MediaCaptureDevicesDispatcher::GetInstance(); } -content::AccessTokenStore *ContentBrowserClientQt::CreateAccessTokenStore() -{ - // We return a dumb in-memory AccessTokenStore implementation for now - // since this is not null-checked before it's used in the content layer. - return new AccessTokenStoreQt; -} - void ContentBrowserClientQt::OverrideWebkitPrefs(content::RenderViewHost *rvh, const GURL &url, WebPreferences *web_prefs) { Q_UNUSED(url); @@ -350,6 +344,11 @@ void ContentBrowserClientQt::OverrideWebkitPrefs(content::RenderViewHost *rvh, c static_cast<WebContentsDelegateQt*>(webContents->GetDelegate())->overrideWebPreferences(webContents, web_prefs); } +content::AccessTokenStore *ContentBrowserClientQt::CreateAccessTokenStore() +{ + return new AccessTokenStoreQt; +} + net::URLRequestContextGetter* ContentBrowserClientQt::CreateRequestContext(content::BrowserContext* browser_context, content::ProtocolHandlerMap* protocol_handlers, content::URLRequestInterceptorScopedVector request_interceptors) { return static_cast<BrowserContextQt*>(browser_context)->CreateRequestContext(protocol_handlers); |