summaryrefslogtreecommitdiffstats
path: root/src/core/content_browser_client_qt.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/content_browser_client_qt.h')
-rw-r--r--src/core/content_browser_client_qt.h19
1 files changed, 7 insertions, 12 deletions
diff --git a/src/core/content_browser_client_qt.h b/src/core/content_browser_client_qt.h
index 4f216030c..879546994 100644
--- a/src/core/content_browser_client_qt.h
+++ b/src/core/content_browser_client_qt.h
@@ -78,8 +78,8 @@ public:
virtual void ResourceDispatcherHostCreated() Q_DECL_OVERRIDE;
virtual gfx::GLShareGroup* GetInProcessGpuShareGroup() Q_DECL_OVERRIDE;
virtual content::MediaObserver* GetMediaObserver() Q_DECL_OVERRIDE;
+ virtual content::AccessTokenStore* CreateAccessTokenStore() Q_DECL_OVERRIDE;
virtual void OverrideWebkitPrefs(content::RenderViewHost *, const GURL &, WebPreferences *) Q_DECL_OVERRIDE;
- virtual content::AccessTokenStore *CreateAccessTokenStore() Q_DECL_OVERRIDE;
virtual void AllowCertificateError(
int render_process_id,
int render_frame_id,
@@ -91,19 +91,14 @@ public:
bool strict_enforcement,
const base::Callback<void(bool)>& callback,
content::CertificateRequestResultType* result) Q_DECL_OVERRIDE;
- virtual void RequestGeolocationPermission(
- content::WebContents *webContents,
- int bridge_id,
- const GURL &requesting_frame,
- bool user_gesture,
- base::Callback<void(bool)> result_callback,
- base::Closure *cancel_callback) Q_DECL_OVERRIDE;
+ void RequestGeolocationPermission(content::WebContents* web_contents, int, const GURL& requesting_frame
+ , bool, base::Callback<void(bool)> resultCallback
+ , base::Closure* cancelCallback) Q_DECL_OVERRIDE;
+ content::LocationProvider* OverrideSystemLocationProvider() Q_DECL_OVERRIDE;
- BrowserContextQt* browser_context();
+ virtual net::URLRequestContextGetter *CreateRequestContext(content::BrowserContext *browser_context, content::ProtocolHandlerMap *protocol_handlers, content::URLRequestInterceptorScopedVector request_interceptorss) Q_DECL_OVERRIDE;
- virtual net::URLRequestContextGetter *CreateRequestContext(content::BrowserContext *content_browser_context, content::ProtocolHandlerMap *protocol_handlers, content::URLRequestInterceptorScopedVector request_interceptorss) Q_DECL_OVERRIDE;
-
- void enableInspector(bool);
+ void enableInspector(bool enable, content::BrowserContext *browser_context);
private:
BrowserMainPartsQt* m_browserMainParts;