Merge 66837 - 2010-09-06 Jonathan Dixon <joth@chromium.org>...

WebKit/chromium/src/WebGeolocationServiceBridgeImpl.cpp

Index: WebKit/chromium/src/WebGeolocationServiceBridgeImpl.cpp
===================================================================
--- WebKit/chromium/src/WebGeolocationServiceBridgeImpl.cpp	(revision 67095)
+++ WebKit/chromium/src/WebGeolocationServiceBridgeImpl.cpp	(working copy)
@@ -79,6 +79,7 @@
     virtual void setIsAllowed(bool allowed);
     virtual void setLastPosition(double latitude, double longitude, bool providesAltitude, double altitude, double accuracy, bool providesAltitudeAccuracy, double altitudeAccuracy, bool providesHeading, double heading, bool providesSpeed, double speed, long long timestamp);
     virtual void setLastError(int errorCode, const WebString& message);
+    virtual void onWebGeolocationServiceDestroyed();
 
 private:
     WebViewClient* getWebViewClient();
@@ -176,6 +177,10 @@
     return webViewClient;
 }
 
+void WebGeolocationServiceBridgeImpl::onWebGeolocationServiceDestroyed()
+{
+}
+
 } // namespace WebKit
 
 #endif // ENABLE(GEOLOCATION)