Merge webkit.org at r55033 : Initial merge by git

Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5

1 files changed, 6 insertions, 0 deletions

diff --git a/WebKit/chromium/public/WebViewClient.h b/WebKit/chromium/public/WebViewClient.h
index 4d272bb..a2de115 100644
--- a/WebKit/chromium/public/WebViewClient.h
+++ b/WebKit/chromium/public/WebViewClient.h
@@ -46,6 +46,7 @@ class WebAccessibilityObject;
 class WebDragData;
 class WebFileChooserCompletion;
 class WebFrame;
+class WebGeolocationServiceInterface;
 class WebNode;
 class WebNotificationPresenter;
 class WebRange;
@@ -277,6 +278,11 @@ public:
     virtual void removeAutofillSuggestions(const WebString& name,
                                            const WebString& value) { }
 
+    // Geolocation ---------------------------------------------------------
+
+    // Access the embedder API for geolocation services.
+    virtual WebKit::WebGeolocationServiceInterface* getGeolocationService() { return 0; }
+
 protected:
     ~WebViewClient() { }
 };