Revert rev 69137 due to incorrect change log.

chrome/renderer/render_view.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_RENDERER_RENDER_VIEW_H_
 #define CHROME_RENDERER_RENDER_VIEW_H_
 #pragma once
 
 #include <deque>
 #include <map>
@@ skipping 46 matching lines @@
 class AutoFillHelper;
 class CustomMenuListener;
 class DictionaryValue;
 class DeviceOrientationDispatcher;
 class DevToolsAgent;
 class DevToolsClient;
 class DomAutomationController;
 class DOMUIBindings;
 class ExternalHostBindings;
 class FilePath;
-class GeolocationDispatcher;
 class GeolocationDispatcherOld;
 class GURL;
 class ListValue;
 class NavigationState;
 class NotificationProvider;
 class PageClickTracker;
 class PasswordAutocompleteManager;
 class PepperDeviceTest;
 class PluginGroup;
 class PrintWebViewHelper;
@@ skipping 36 matching lines @@
 
 namespace WebKit {
 class WebAccessibilityCache;
 class WebAccessibilityObject;
 class WebApplicationCacheHost;
 class WebApplicationCacheHostClient;
 class WebDataSource;
 class WebDocument;
 class WebDragData;
 class WebFrame;
-class WebGeolocationClient;
 class WebGeolocationServiceInterface;
 class WebImage;
 class WebInputElement;
 class WebKeyboardEvent;
 class WebMediaPlayer;
 class WebMediaPlayerClient;
 class WebMouseEvent;
 class WebNode;
 class WebPlugin;
 class WebSpeechInputController;
@@ skipping 342 matching lines @@
                                            const WebKit::WebString& label,
                                            int unique_id,
                                            unsigned index);
   virtual void didSelectAutoFillSuggestion(const WebKit::WebNode& node,
                                            const WebKit::WebString& value,
                                            const WebKit::WebString& label,
                                            int unique_id);
   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();
   virtual void zoomLimitsChanged(double minimum_level, double maximum_level);
   virtual void zoomLevelChanged();
 
   // WebKit::WebFrameClient implementation -------------------------------------
 
   virtual WebKit::WebPlugin* createPlugin(
       WebKit::WebFrame* frame,
@@ skipping 871 matching lines @@
   // Holds a reference to the service which provides desktop notifications.
   scoped_ptr<NotificationProvider> notification_provider_;
 
   // PrintWebViewHelper handles printing.  Note that this object is constructed
   // when printing for the first time but only destroyed with the RenderView.
   scoped_ptr<PrintWebViewHelper> print_helper_;
 
   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
 
   // Handles accessibility requests into the renderer side, as well as
   // maintains the cache and other features of the accessibility tree.
   scoped_ptr<WebKit::WebAccessibilityCache> accessibility_;
 
   // Collect renderer accessibility notifications until they are ready to be
   // sent to the browser.
   std::vector<RendererAccessibilityNotification>
       pending_accessibility_notifications_;
 
@@ skipping 92 matching lines @@
   // ADDING NEW DATA? Please see if it fits appropriately in one of the above
   // sections rather than throwing it randomly at the end. If you're adding a
   // bunch of stuff, you should probably create a helper class and put your
   // data and methods on that to avoid bloating RenderView more.
   // ---------------------------------------------------------------------------
 
   DISALLOW_COPY_AND_ASSIGN(RenderView);
 };
 
 #endif  // CHROME_RENDERER_RENDER_VIEW_H_