From f05b935882198ccf7d81675736e3aeb089c5113a Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Thu, 5 May 2011 14:36:32 +0100
Subject: Merge WebKit at r74534: Initial merge by git.

Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
---
 WebKit/chromium/public/WebViewClient.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'WebKit/chromium/public/WebViewClient.h')

diff --git a/WebKit/chromium/public/WebViewClient.h b/WebKit/chromium/public/WebViewClient.h
index 7ce1483..033e120 100644
--- a/WebKit/chromium/public/WebViewClient.h
+++ b/WebKit/chromium/public/WebViewClient.h
@@ -52,6 +52,7 @@ class WebExternalPopupMenu;
 class WebExternalPopupMenuClient;
 class WebFileChooserCompletion;
 class WebFrame;
+class WebGeolocationClient;
 class WebGeolocationService;
 class WebImage;
 class WebInputElement;
@@ -340,7 +341,9 @@ public:
 
     // Geolocation ---------------------------------------------------------
 
-    // Access the embedder API for geolocation services.
+    // Access the embedder API for (client-based) geolocation client .
+    virtual WebGeolocationClient* geolocationClient() { return 0; }
+    // Access the embedder API for (non-client-based) geolocation services.
     virtual WebGeolocationService* geolocationService() { return 0; }
 
     // Speech --------------------------------------------------------------
-- 
cgit v1.1