summaryrefslogtreecommitdiffstats
path: root/WebCore/page/GeolocationControllerClient.h
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/page/GeolocationControllerClient.h')
-rw-r--r--WebCore/page/GeolocationControllerClient.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/WebCore/page/GeolocationControllerClient.h b/WebCore/page/GeolocationControllerClient.h
index 830c64b..01b1a27 100644
--- a/WebCore/page/GeolocationControllerClient.h
+++ b/WebCore/page/GeolocationControllerClient.h
@@ -32,6 +32,11 @@ class GeolocationPosition;
class GeolocationControllerClient {
public:
+<<<<<<< HEAD
+=======
+ virtual void geolocationDestroyed() = 0;
+
+>>>>>>> webkit.org at r54127
virtual void startUpdating() = 0;
virtual void stopUpdating() = 0;
virtual GeolocationPosition* lastPosition() = 0;