Client-based geolocation support.

chrome/renderer/render_view.h

Index: chrome/renderer/render_view.h
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index 42263193bfdca33f391ffb102ef63a7031e1ae29..8a336462a2eed073d18281b82658d80ef1a83c6e 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -63,6 +63,7 @@ class DomAutomationController;
 class DOMUIBindings;
 class ExternalHostBindings;
 class FilePath;
+class GeolocationDispatcher;
 class GeolocationDispatcherOld;
 class GURL;
 class ListValue;
@@ -119,6 +120,7 @@ class WebDataSource;
 class WebDocument;
 class WebDragData;
 class WebFrame;
+class WebGeolocationClient;
 class WebGeolocationServiceInterface;
 class WebImage;
 class WebInputElement;
@@ -472,7 +474,11 @@ class RenderView : public RenderWidget,
   virtual void didClearAutoFillSelection(const WebKit::WebNode& node);
   virtual void didAcceptAutocompleteSuggestion(
       const WebKit::WebInputElement& element);
+#if defined(ENABLE_CLIENT_BASED_GEOLOCATION)
+  virtual WebKit::WebGeolocationClient* geolocationClient();
+#else
   virtual WebKit::WebGeolocationService* geolocationService();
+#endif
   virtual WebKit::WebSpeechInputController* speechInputController(
       WebKit::WebSpeechInputListener* listener);
   virtual WebKit::WebDeviceOrientationClient* deviceOrientationClient();
@@ -1364,7 +1370,11 @@ class RenderView : public RenderWidget,
   scoped_refptr<AudioMessageFilter> audio_message_filter_;
 
   // The geolocation dispatcher attached to this view, lazily initialized.
+#if ENABLE_CLIENT_BASED_GEOLOCATION
+  scoped_ptr<GeolocationDispatcher> geolocation_dispatcher_;
+#else
   scoped_ptr<GeolocationDispatcherOld> geolocation_dispatcher_;
+#endif

[joth, 2010/12/07 10:24:51]

ISTM we could have reduced churn by leaving the class named as
GeolocationDispatcher through out, but just giving it a different definition and
.cc impl based on the build flags.

Probably not worth changing tack on this now though.

[John Knottenbelt, 2010/12/07 12:30:04]

Agree. Once we switch over, I plan to rename things back and remove the _old
suffix on dispatcher_host_old, which actually serves both the client and
non-client-based dispatchers at the moment.

 
   // Handles accessibility requests into the renderer side, as well as
   // maintains the cache and other features of the accessibility tree.