Remove Geolocation API and Upgrade version numbers to 65

CefSharp.BrowserSubprocess.Core/Resource.rc

@@ -1,6 +1,6 @@
 1 VERSIONINFO
- FILEVERSION 64.0.0
- PRODUCTVERSION 64.0.0
+ FILEVERSION 65.0.0
+ PRODUCTVERSION 65.0.0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -16,10 +16,10 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "CefSharp.BrowserSubprocess.Core"
-            VALUE "FileVersion", "64.0.0"
-            VALUE "LegalCopyright", "Copyright © 2010-2017 The CefSharp Authors"
+            VALUE "FileVersion", "65.0.0"
+            VALUE "LegalCopyright", "Copyright © 2010-2018 The CefSharp Authors"
             VALUE "ProductName", "CefSharp"
-            VALUE "ProductVersion", "64.0.0"
+            VALUE "ProductVersion", "65.0.0"
         END
     END
     BLOCK "VarFileInfo"

CefSharp.BrowserSubprocess/app.manifest

@@ -8,7 +8,7 @@
     xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-  <assemblyIdentity version="64.0.0.0" name="CefSharp.BrowserSubprocess.app" />
+  <assemblyIdentity version="65.0.0.0" name="CefSharp.BrowserSubprocess.app" />
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">

CefSharp.Core/Cef.h

@@ -16,7 +16,6 @@
 #include "Internals/CefSharpApp.h"
 #include "Internals/PluginVisitor.h"
 #include "Internals/CefTaskScheduler.h"
-#include "Internals/CefGetGeolocationCallbackAdapter.h"
 #include "Internals/CefRegisterCdmCallbackAdapter.h"
 #include "CookieManager.h"
 #include "CefSettings.h"
@@ -515,37 +514,7 @@ namespace CefSharp
         {
             CefEnableHighDPISupport();
         }
-
-        /// <summary>
-        /// Request a one-time geolocation update.
-        /// This function bypasses any user permission checks so should only be
-        /// used by code that is allowed to access location information. 
-        /// </summary>
-        /// <returns>Returns 'best available' location info or, if the location update failed, with error info.</returns>
-        [[deprecated("Geolocation support is reportedly broken and will be removed from the CEF project, as a consiquence it will be removed from CefSharp. See https://github.com/cefsharp/CefSharp/issues/2293 for details.")]]
-        static bool GetGeolocation(IGetGeolocationCallback^ callback)
-        {
-            CefRefPtr<CefGetGeolocationCallback> wrapper = callback == nullptr ? NULL : new CefGetGeolocationCallbackAdapter(callback);
-
-            return CefGetGeolocation(wrapper);
-        }
-
-        /// <summary>
-        /// Request a one-time geolocation update.
-        /// This function bypasses any user permission checks so should only be
-        /// used by code that is allowed to access location information. 
-        /// </summary>
-        /// <returns>Returns 'best available' location info or, if the location update failed, with error info.</returns>
-        [[deprecated("Geolocation support is reportedly broken and will be removed from the CEF project, as a consiquence it will be removed from CefSharp. See https://github.com/cefsharp/CefSharp/issues/2293 for details.")]]
-        static Task<Geoposition^>^ GetGeolocationAsync()
-        {
-            auto callback = gcnew TaskGetGeolocationCallback();
-
-            GetGeolocation(callback);
-
-            return callback->Task;
-        }
-
+
         /// <summary>
         /// Returns true if called on the specified CEF thread.
         /// </summary>

CefSharp.Core/CefSharp.Core.vcxproj.filters

@@ -157,9 +157,6 @@
     <ClInclude Include="Internals\CefBeforeDownloadCallbackWrapper.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Internals\CefGeolocationCallbackWrapper.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="Internals\CefFileDialogCallbackWrapper.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -265,9 +262,6 @@
     <ClInclude Include="Internals\CefDeleteCookiesCallbackAdapter.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Internals\CefGetGeolocationCallbackAdapter.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>

CefSharp.Core/Internals/ClientAdapter.cpp

@@ -18,7 +18,6 @@
 #include "CefSharpBrowserWrapper.h"
 #include "CefDownloadItemCallbackWrapper.h"
 #include "CefBeforeDownloadCallbackWrapper.h"
-#include "CefGeolocationCallbackWrapper.h"
 #include "CefFileDialogCallbackWrapper.h"
 #include "CefAuthCallbackWrapper.h"
 #include "CefJSDialogCallbackWrapper.h"
@@ -1050,33 +1049,6 @@ namespace CefSharp
             }
         }
 
-        bool ClientAdapter::OnRequestGeolocationPermission(CefRefPtr<CefBrowser> browser, const CefString& requesting_url, int request_id, CefRefPtr<CefGeolocationCallback> callback)
-        {
-            auto handler = _browserControl->GeolocationHandler;
-
-            if (handler == nullptr)
-            {
-                // Default deny, as CEF does.
-                return false;
-            }
-
-            auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
-            auto callbackWrapper = gcnew CefGeolocationCallbackWrapper(callback);
-
-            return handler->OnRequestGeolocationPermission(_browserControl, browserWrapper, StringUtils::ToClr(requesting_url), request_id, callbackWrapper);
-        }
-
-        void ClientAdapter::OnCancelGeolocationPermission(CefRefPtr<CefBrowser> browser, int request_id)
-        {
-            auto handler = _browserControl->GeolocationHandler;
-
-            if (handler != nullptr)
-            {
-                auto browserWrapper = GetBrowserWrapper(browser->GetIdentifier(), browser->IsPopup());
-                handler->OnCancelGeolocationPermission(_browserControl, browserWrapper, request_id);
-            }
-        }
-
         void ClientAdapter::OnBeforeDownload(CefRefPtr<CefBrowser> browser, CefRefPtr<CefDownloadItem> download_item,
             const CefString& suggested_name, CefRefPtr<CefBeforeDownloadCallback> callback)
         {

CefSharp.Core/Internals/ClientAdapter.h

@@ -28,7 +28,6 @@ namespace CefSharp
             public CefJSDialogHandler,
             public CefDialogHandler,
             public CefDragHandler,
-            public CefGeolocationHandler,
             public CefDownloadHandler,
             public CefFindHandler
         {
@@ -97,7 +96,6 @@ namespace CefSharp
             virtual DECL CefRefPtr<CefJSDialogHandler> GetJSDialogHandler() OVERRIDE { return this; }
             virtual DECL CefRefPtr<CefDialogHandler> GetDialogHandler() OVERRIDE { return this; }
             virtual DECL CefRefPtr<CefDragHandler> GetDragHandler() OVERRIDE { return this; }
-            virtual DECL CefRefPtr<CefGeolocationHandler> GetGeolocationHandler() OVERRIDE { return this; }
             virtual DECL CefRefPtr<CefFindHandler> GetFindHandler() OVERRIDE { return this; }
             virtual DECL bool OnProcessMessageReceived(CefRefPtr<CefBrowser> browser, CefProcessId source_process, CefRefPtr<CefProcessMessage> message) OVERRIDE;
 
@@ -184,11 +182,6 @@ namespace CefSharp
             virtual DECL bool OnDragEnter(CefRefPtr<CefBrowser> browser, CefRefPtr<CefDragData> dragData, DragOperationsMask mask) OVERRIDE;
             virtual DECL void OnDraggableRegionsChanged(CefRefPtr<CefBrowser> browser, const std::vector<CefDraggableRegion>& regions) OVERRIDE;
 
-            //CefGeolocationHandler
-            virtual DECL bool OnRequestGeolocationPermission(CefRefPtr<CefBrowser> browser, const CefString& requesting_url, int request_id,
-                CefRefPtr<CefGeolocationCallback> callback) OVERRIDE;
-            virtual DECL void OnCancelGeolocationPermission(CefRefPtr<CefBrowser> browser, int request_id) OVERRIDE;
-
             //CefDownloadHandler
             virtual DECL void OnBeforeDownload(CefRefPtr<CefBrowser> browser, CefRefPtr<CefDownloadItem> download_item,
                 const CefString& suggested_name, CefRefPtr<CefBeforeDownloadCallback> callback) OVERRIDE;

CefSharp.Core/Resource.rc

@@ -1,6 +1,6 @@
 1 VERSIONINFO
- FILEVERSION 64.0.0
- PRODUCTVERSION 64.0.0
+ FILEVERSION 65.0.0
+ PRODUCTVERSION 65.0.0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -16,10 +16,10 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "CefSharp.Core"
-            VALUE "FileVersion", "64.0.0"
-            VALUE "LegalCopyright", "Copyright © 2010-2017 The CefSharp Authors"
+            VALUE "FileVersion", "65.0.0"
+            VALUE "LegalCopyright", "Copyright © 2010-2018 The CefSharp Authors"
             VALUE "ProductName", "CefSharp"
-            VALUE "ProductVersion", "64.0.0"
+            VALUE "ProductVersion", "65.0.0"
         END
     END
     BLOCK "VarFileInfo"

CefSharp.OffScreen.Example/app.manifest

@@ -7,7 +7,7 @@
   xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-  <assemblyIdentity version="64.0.0.0" name="CefSharp.OffScreen.Example.app" />
+  <assemblyIdentity version="65.0.0.0" name="CefSharp.OffScreen.Example.app" />
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">

CefSharp.OffScreen/ChromiumWebBrowser.cs

@@ -174,11 +174,6 @@ public class ChromiumWebBrowser : IRenderWebBrowser
         /// <value>The resource handler factory.</value>
         public IResourceHandlerFactory ResourceHandlerFactory { get; set; }
         /// <summary>
-        /// Implement <see cref="IGeolocationHandler" /> and assign to handle requests for permission to use geolocation.
-        /// </summary>
-        /// <value>The geolocation handler.</value>
-        public IGeolocationHandler GeolocationHandler { get; set; }
-        /// <summary>
         /// Implement <see cref="IRenderProcessMessageHandler" /> and assign to handle messages from the render process.
         /// </summary>
         /// <value>The render process message handler.</value>

CefSharp.WinForms.Example/BrowserTabUserControl.cs

@@ -38,7 +38,6 @@ public BrowserTabUserControl(Action<string, int?> openNewTab, string url, bool m
             browser.MenuHandler = new MenuHandler();
             browser.RequestHandler = new WinFormsRequestHandler(openNewTab);
             browser.JsDialogHandler = new JsDialogHandler();
-            browser.GeolocationHandler = new GeolocationHandler();
             browser.DownloadHandler = new DownloadHandler();
             if (multiThreadedMessageLoopEnabled)
             {

CefSharp.WinForms.Example/app.manifest

@@ -8,7 +8,7 @@
     xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-  <assemblyIdentity version="64.0.0.0" name="CefSharp.WinForms.Example.app" />
+  <assemblyIdentity version="65.0.0.0" name="CefSharp.WinForms.Example.app" />
 
   <dependency>
     <dependentAssembly>