diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-02 14:48:25 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-06-01 16:56:06 +0000 |
| commit | 4d61ba751088f650fe5d22bbf88036e80ff19f0f (patch) | |
| tree | a1583bd501cfd675655396775108a9b7b3881b95 /src/core/browser_context_qt.h | |
| parent | 06a60e33c6101d725d8b88d4e3c647b9b2d3e7ab (diff) | |
Basic porting to Chromium 51
Trivial changes in methods, arguments and types.
Change-Id: Ic707c376249f816268223e696ed5f6251df1f85f
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'src/core/browser_context_qt.h')
| -rw-r--r-- | src/core/browser_context_qt.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/core/browser_context_qt.h b/src/core/browser_context_qt.h index e2156f147..68e1244e1 100644 --- a/src/core/browser_context_qt.h +++ b/src/core/browser_context_qt.h @@ -74,7 +74,6 @@ public: virtual bool IsOffTheRecord() const Q_DECL_OVERRIDE; virtual net::URLRequestContextGetter *GetRequestContext() Q_DECL_OVERRIDE; - virtual net::URLRequestContextGetter *GetRequestContextForRenderProcess(int) Q_DECL_OVERRIDE; virtual net::URLRequestContextGetter *GetMediaRequestContext() Q_DECL_OVERRIDE; virtual net::URLRequestContextGetter *GetMediaRequestContextForRenderProcess(int) Q_DECL_OVERRIDE; virtual net::URLRequestContextGetter *GetMediaRequestContextForStoragePartition(const base::FilePath&, bool) Q_DECL_OVERRIDE; @@ -84,7 +83,13 @@ public: virtual storage::SpecialStoragePolicy *GetSpecialStoragePolicy() Q_DECL_OVERRIDE; virtual content::PushMessagingService* GetPushMessagingService() Q_DECL_OVERRIDE; virtual content::SSLHostStateDelegate* GetSSLHostStateDelegate() Q_DECL_OVERRIDE; - net::URLRequestContextGetter *CreateRequestContext(content::ProtocolHandlerMap *protocol_handlers, content::URLRequestInterceptorScopedVector request_interceptors); + net::URLRequestContextGetter *CreateRequestContext( + content::ProtocolHandlerMap *protocol_handlers, + content::URLRequestInterceptorScopedVector request_interceptors) Q_DECL_OVERRIDE; + net::URLRequestContextGetter* CreateRequestContextForStoragePartition( + const base::FilePath& partition_path, bool in_memory, + content::ProtocolHandlerMap* protocol_handlers, + content::URLRequestInterceptorScopedVector request_interceptors) Q_DECL_OVERRIDE; virtual scoped_ptr<content::ZoomLevelDelegate> CreateZoomLevelDelegate(const base::FilePath& partition_path) Q_DECL_OVERRIDE; virtual content::PermissionManager *GetPermissionManager() Q_DECL_OVERRIDE; virtual content::BackgroundSyncController* GetBackgroundSyncController() Q_DECL_OVERRIDE; |