Client-based geolocation support.

chrome/renderer/geolocation_dispatcher_old.h

Index: chrome/renderer/geolocation_dispatcher_old.h
diff --git a/chrome/renderer/geolocation_dispatcher_old.h b/chrome/renderer/geolocation_dispatcher_old.h
index 57f7d8a6285665ef1633a9b1225b9d8a8932103b..51567ef5c377d9d2f565ce3907e46566f1c7199e 100644
--- a/chrome/renderer/geolocation_dispatcher_old.h
+++ b/chrome/renderer/geolocation_dispatcher_old.h
@@ -6,6 +6,10 @@
 #define CHROME_RENDERER_GEOLOCATION_DISPATCHER_OLD_H_
 #pragma once
 
+#if !defined(ENABLE_CLIENT_BASED_GEOLOCATION)
+// TODO(jknotten): Remove this class once the new client-based implementation is
+// checked in (see http://crbug.com/59908).
+
 #include "base/basictypes.h"
 #include "base/id_map.h"
 #include "ipc/ipc_message.h"
@@ -21,8 +25,6 @@ struct Geoposition;
 // It's the complement of GeolocationDispatcherHostOld (owned by
 // RenderViewHost).
 
-// TODO(jknotten): Remove this class once the new client-based implementation is
-// checked in (see http://crbug.com/59908).
 class GeolocationDispatcherOld : public WebKit::WebGeolocationService {
  public:
   explicit GeolocationDispatcherOld(RenderView* render_view);
@@ -61,4 +63,6 @@ class GeolocationDispatcherOld : public WebKit::WebGeolocationService {
   DISALLOW_COPY_AND_ASSIGN(GeolocationDispatcherOld);
 };
 
+#endif // ENABLE_CLIENT_BASED_GEOLOCATION
+
 #endif  // CHROME_RENDERER_GEOLOCATION_DISPATCHER_OLD_H_