Merge 66886 - 2010-09-07 Jonathan Dixon <joth@chromium.org>...

WebKit/chromium/public/WebGeolocationService.h

Index: WebKit/chromium/public/WebGeolocationService.h
===================================================================
--- WebKit/chromium/public/WebGeolocationService.h	(revision 67096)
+++ WebKit/chromium/public/WebGeolocationService.h	(working copy)
@@ -31,10 +31,9 @@
 #ifndef WebGeolocationService_h
 #define WebGeolocationService_h
 
-#include "WebGeolocationServiceBridge.h"
-
 namespace WebKit {
 
+class WebGeolocationServiceBridge;
 class WebString;
 class WebURL;
 
@@ -50,10 +49,14 @@
 
     // Attaches the WebGeolocationServiceBridge to the embedder and returns its
     // id, which should be used on subsequent calls for the methods above.
+    // An ID of zero indicates the attach failed.
     virtual int attachBridge(WebGeolocationServiceBridge*) { return 0; }
 
     // Detaches the WebGeolocationServiceBridge from the embedder.
     virtual void detachBridge(int bridgeId) { }
+
+protected:
+    virtual ~WebGeolocationService() {}
 };
 
 } // namespace WebKit