diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-07-28 17:29:14 +0200 |
---|---|---|
committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-14 16:43:32 +0200 |
commit | b1d423a3fc2cb3eeacc2a3e91ac9bdd2211c2613 (patch) | |
tree | 53f39e4e7c6a76d19a92fc23fde0728e6df95fc7 /src/core/browser_context_qt.cpp | |
parent | f987b713b9f4e363056bf5174a762acb5b77ed79 (diff) |
Update the QtWebEngineCore library to run on top of Chromium 37
Most of the patch is about upstream classes/methods that changed.
Other important details:
- icu data files are now used by default
- cygwin is no longer required to build on Windows
- RenderFrameHost has been replacing RenderViewHost in a few places,
following the separate process iframes support in Chromium
- The user agent is accessed through ContentClient::GetUserAgent
instead of from the command line switches
Change-Id: I86cc93aff7ce31176a80b0b4a5d54025674a451c
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/core/browser_context_qt.cpp')
-rw-r--r-- | src/core/browser_context_qt.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/core/browser_context_qt.cpp b/src/core/browser_context_qt.cpp index f0b43a334..55fb27e3c 100644 --- a/src/core/browser_context_qt.cpp +++ b/src/core/browser_context_qt.cpp @@ -111,16 +111,6 @@ net::URLRequestContextGetter *BrowserContextQt::GetMediaRequestContextForStorage return GetRequestContext(); } -void BrowserContextQt::RequestMIDISysExPermission(int, int, int, const GURL &, const MIDISysExPermissionCallback &callback) -{ - callback.Run(false); -} - -void BrowserContextQt::CancelMIDISysExPermissionRequest(int, int, int, const GURL &) -{ - -} - content::ResourceContext *BrowserContextQt::GetResourceContext() { return resourceContext.get(); @@ -131,9 +121,8 @@ content::DownloadManagerDelegate *BrowserContextQt::GetDownloadManagerDelegate() return downloadManagerDelegate.get(); } -content::GeolocationPermissionContext *BrowserContextQt::GetGeolocationPermissionContext() +content::BrowserPluginGuestManager *BrowserContextQt::GetGuestManager() { - QT_NOT_YET_IMPLEMENTED return 0; } @@ -143,6 +132,11 @@ quota::SpecialStoragePolicy *BrowserContextQt::GetSpecialStoragePolicy() return 0; } +content::PushMessagingService *BrowserContextQt::GetPushMessagingService() +{ + return 0; +} + net::URLRequestContextGetter *BrowserContextQt::CreateRequestContext(content::ProtocolHandlerMap *protocol_handlers) { url_request_getter_ = new URLRequestContextGetterQt(GetPath(), protocol_handlers); |