webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 7 insertions, 8 deletions

diff --git a/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtilsClient.h b/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtilsClient.h
index 25d67cc10..b70e896db 100644
--- a/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtilsClient.h
+++ b/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtilsClient.h
@@ -23,11 +23,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef NavigatorContentUtilsClient_h
-#define NavigatorContentUtilsClient_h
+#pragma once
 
 #if ENABLE(NAVIGATOR_CONTENT_UTILS)
 
+#include "URL.h"
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
@@ -37,7 +37,7 @@ class Page;
 class NavigatorContentUtilsClient {
 public:
     virtual ~NavigatorContentUtilsClient() { }
-    virtual void registerProtocolHandler(const String& scheme, const String& baseURL, const String& url, const String& title) = 0;
+    virtual void registerProtocolHandler(const String& scheme, const URL& baseURL, const URL&, const String& title) = 0;
 
 #if ENABLE(CUSTOM_SCHEME_HANDLER)
     enum CustomHandlersState {
@@ -46,14 +46,13 @@ public:
         CustomHandlersDeclined
     };
 
-    virtual CustomHandlersState isProtocolHandlerRegistered(const String& scheme, const String& baseURL, const String& url) = 0;
-    virtual void unregisterProtocolHandler(const String& scheme, const String& baseURL, const String& url) = 0;
+    virtual CustomHandlersState isProtocolHandlerRegistered(const String& scheme, const URL& baseURL, const URL&) = 0;
+    virtual void unregisterProtocolHandler(const String& scheme, const URL& baseURL, const URL&) = 0;
 #endif
 };
 
-void provideNavigatorContentUtilsTo(Page*, NavigatorContentUtilsClient*);
+void provideNavigatorContentUtilsTo(Page*, std::unique_ptr<NavigatorContentUtilsClient>);
 
-}
+} // namespace WebCore
 
 #endif // ENABLE(NAVIGATOR_CONTENT_UTILS)
-#endif // NavigatorContentUtilsClient_h