1 files changed, 22 insertions, 34 deletions

diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
index 4948d1d8d..a327270a5 100644
--- a/src/core/content_browser_client_qt.cpp
+++ b/src/core/content_browser_client_qt.cpp
@@ -55,11 +55,15 @@
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_share_group.h"
 
+#include "access_token_store_qt.h"
 #include "browser_context_qt.h"
 #include "certificate_error_controller.h"
 #include "certificate_error_controller_p.h"
 #include "desktop_screen_qt.h"
 #include "dev_tools_http_handler_delegate_qt.h"
+#ifdef QT_USE_POSITIONING
+#include "location_provider_qt.h"
+#endif
 #include "media_capture_devices_dispatcher.h"
 #include "resource_dispatcher_host_delegate_qt.h"
 #include "web_contents_delegate_qt.h"
@@ -203,12 +207,10 @@ public:
 
     void PreMainMessageLoopRun() Q_DECL_OVERRIDE
     {
-        m_browserContext.reset(new BrowserContextQt());
     }
 
     void PostMainMessageLoopRun()
     {
-        m_browserContext.reset();
     }
 
     int PreCreateThreads() Q_DECL_OVERRIDE
@@ -219,13 +221,7 @@ public:
         return 0;
     }
 
-    BrowserContextQt* browser_context() const {
-        return m_browserContext.get();
-    }
-
 private:
-    scoped_ptr<BrowserContextQt> m_browserContext;
-
     DISALLOW_COPY_AND_ASSIGN(BrowserMainPartsQt);
 };
 
@@ -246,7 +242,7 @@ public:
             m_handle = pni->nativeResourceForContext(QByteArrayLiteral("cglcontextobj"), qtContext);
         else if (platform == QLatin1String("qnx"))
             m_handle = pni->nativeResourceForContext(QByteArrayLiteral("eglcontext"), qtContext);
-        else if (platform == QLatin1String("eglfs"))
+        else if (platform == QLatin1String("eglfs") || platform == QLatin1String("wayland"))
             m_handle = pni->nativeResourceForContext(QByteArrayLiteral("eglcontext"), qtContext);
         else if (platform == QLatin1String("windows")) {
             if (gfx::GetGLImplementation() == gfx::kGLImplementationEGLGLES2)
@@ -364,22 +360,15 @@ content::AccessTokenStore *ContentBrowserClientQt::CreateAccessTokenStore()
     return new AccessTokenStoreQt;
 }
 
-BrowserContextQt* ContentBrowserClientQt::browser_context() {
-    Q_ASSERT(m_browserMainParts);
-    return static_cast<BrowserMainPartsQt*>(m_browserMainParts)->browser_context();
-}
-
-net::URLRequestContextGetter* ContentBrowserClientQt::CreateRequestContext(content::BrowserContext* content_browser_context, content::ProtocolHandlerMap* protocol_handlers, content::URLRequestInterceptorScopedVector request_interceptors)
+net::URLRequestContextGetter* ContentBrowserClientQt::CreateRequestContext(content::BrowserContext* browser_context, content::ProtocolHandlerMap* protocol_handlers, content::URLRequestInterceptorScopedVector request_interceptors)
 {
-    if (content_browser_context != browser_context())
-        fprintf(stderr, "Warning: off the record browser context not implemented !\n");
-    return static_cast<BrowserContextQt*>(browser_context())->CreateRequestContext(protocol_handlers);
+    return static_cast<BrowserContextQt*>(browser_context)->CreateRequestContext(protocol_handlers);
 }
 
-void ContentBrowserClientQt::enableInspector(bool enable)
+void ContentBrowserClientQt::enableInspector(bool enable, content::BrowserContext* browser_context)
 {
     if (enable && !m_devtools) {
-        m_devtools.reset(new DevToolsHttpHandlerDelegateQt(browser_context()));
+        m_devtools.reset(new DevToolsHttpHandlerDelegateQt(browser_context));
     } else if (!enable && m_devtools) {
         m_devtools.reset();
     }
@@ -409,19 +398,18 @@ void ContentBrowserClientQt::AllowCertificateError(int render_process_id, int re
     contentsDelegate->allowCertificateError(errorController);
 }
 
-void ContentBrowserClientQt::RequestGeolocationPermission(content::WebContents *webContents,
-                                                          int bridge_id,
-                                                          const GURL &requesting_frame,
-                                                          bool user_gesture,
-                                                          base::Callback<void(bool)> result_callback,
-                                                          base::Closure *cancel_callback)
+void ContentBrowserClientQt::RequestGeolocationPermission(content::WebContents *webContents, int /*bridgeId*/, const GURL &requestingFrameOrigin, bool /*userGesture*/, base::Callback<void (bool)> resultCallback, base::Closure *cancelCallback)
+{
+    WebContentsDelegateQt* contentsDelegate = static_cast<WebContentsDelegateQt*>(webContents->GetDelegate());
+    Q_ASSERT(contentsDelegate);
+    contentsDelegate->requestGeolocationPermission(requestingFrameOrigin, resultCallback, cancelCallback);
+}
+
+content::LocationProvider *ContentBrowserClientQt::OverrideSystemLocationProvider()
 {
-    Q_UNUSED(webContents);
-    Q_UNUSED(bridge_id);
-    Q_UNUSED(requesting_frame);
-    Q_UNUSED(user_gesture);
-    Q_UNUSED(cancel_callback);
-
-    // TODO: Add geolocation support
-    result_callback.Run(false);
+#ifdef QT_USE_POSITIONING
+    return new LocationProviderQt;
+#else
+    return 0; // Leave it up to Chromium to figure something out.
+#endif
 }