diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2013-07-24 17:59:09 +0200 |
|---|---|---|
| committer | Zeno Albisser <zeno.albisser@digia.com> | 2013-07-24 20:32:22 +0200 |
| commit | 38e34792d9b414d666304bf48b96488a7321d999 (patch) | |
| tree | ed40646af7b542fdc8447c91123a9955cf53fe68 /lib/browser_context_qt.h | |
| parent | 0a5caa2c82cd39fecaeb6390423fea4f972a6013 (diff) | |
Cleanup after chromium update.
- Implement recently added pure virtual members:
BrowserContextQt::GetPath() const
BrowserContextQt::RequestMIDISysExPermission(...)
- Remove obsolete function GetSpeechRecognitionPreferences.
- Rename usage of GetActiveURL() to GetVisibleURL().
- Update namespace for usage of type WebPluginGeometry.
- Adjust parameters of RenderWidgetHostViewQt::TextInputChanged.
- Rename RenderWidgetHostViewQt::RenderViewGone to RenderProcessGone
- set_http_server_properties now takes a scoped_ptr.
- Rename WebDropData to content::DropData.
- Rename WebMenuItem to content::MenuItem.
- webkit/support/webkit_support.gyp has been moved to
webkit/webkit_resources.gyp.
Change-Id: I6d5d281b797a8f6197ecb53a08798bd1f6845754
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'lib/browser_context_qt.h')
| -rw-r--r-- | lib/browser_context_qt.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/lib/browser_context_qt.h b/lib/browser_context_qt.h index 33e236044..5b83a4367 100644 --- a/lib/browser_context_qt.h +++ b/lib/browser_context_qt.h @@ -46,7 +46,7 @@ #include "base/files/scoped_temp_dir.h" -#include "base/time.h" +#include "base/time/time.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/resource_context.h" #include "content/public/browser/storage_partition.h" @@ -79,6 +79,12 @@ public: return false; } + virtual base::FilePath GetPath() const + { + // FIXME: return the path of the directory where this context's data is stored. + return base::FilePath(); + } + virtual net::URLRequestContextGetter* GetRequestContext() { return GetDefaultStoragePartition(this)->GetURLRequestContext(); @@ -88,6 +94,12 @@ public: virtual net::URLRequestContextGetter* GetMediaRequestContextForRenderProcess(int) { return GetRequestContext(); } virtual net::URLRequestContextGetter* GetMediaRequestContextForStoragePartition(const base::FilePath&, bool) { return GetRequestContext(); } + virtual void RequestMIDISysExPermission(int render_process_id, int render_view_id, const GURL& requesting_frame, const MIDISysExPermissionCallback& callback) + { + // Always reject requests for testing. + callback.Run(false); + } + virtual content::ResourceContext* GetResourceContext() { return resourceContext.get(); @@ -95,7 +107,6 @@ public: virtual content::DownloadManagerDelegate* GetDownloadManagerDelegate() { return 0; } virtual content::GeolocationPermissionContext* GetGeolocationPermissionContext() { return 0; } - virtual content::SpeechRecognitionPreferences* GetSpeechRecognitionPreferences() { return 0; } virtual quota::SpecialStoragePolicy* GetSpecialStoragePolicy() { return 0; } net::URLRequestContextGetter *CreateRequestContext(content::ProtocolHandlerMap* protocol_handlers) |