Revert rev 69137 due to incorrect change log.

chrome/renderer/render_view.cc

 // 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.
 
 #include "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 45 matching lines @@
 #include "chrome/renderer/devtools_client.h"
 #include "chrome/renderer/dom_ui_bindings.h"
 #include "chrome/renderer/extension_groups.h"
 #include "chrome/renderer/extensions/bindings_utils.h"
 #include "chrome/renderer/extensions/event_bindings.h"
 #include "chrome/renderer/extensions/extension_process_bindings.h"
 #include "chrome/renderer/extensions/extension_renderer_info.h"
 #include "chrome/renderer/extensions/renderer_extension_bindings.h"
 #include "chrome/renderer/external_host_bindings.h"
 #include "chrome/renderer/external_popup_menu.h"
-#if ENABLE_CLIENT_BASED_GEOLOCATION
-#include "chrome/renderer/geolocation_dispatcher.h"
-#else
 #include "chrome/renderer/geolocation_dispatcher_old.h"
-#endif
 #include "chrome/renderer/ggl/ggl.h"
 #include "chrome/renderer/localized_error.h"
 #include "chrome/renderer/media/audio_renderer_impl.h"
 #include "chrome/renderer/media/ipc_video_decoder.h"
 #include "chrome/renderer/navigation_state.h"
 #include "chrome/renderer/notification_provider.h"
 #include "chrome/renderer/page_click_tracker.h"
 #include "chrome/renderer/page_load_histograms.h"
 #include "chrome/renderer/password_autocomplete_manager.h"
 #include "chrome/renderer/plugin_channel_host.h"
@@ skipping 5535 matching lines @@
 
 void RenderView::OnPageTranslated() {
   WebFrame* frame = webview()->mainFrame();
   if (!frame)
     return;
 
   // The page is translated, so try to extract the form data again.
   autofill_helper_->FrameContentsAvailable(frame);
 }
 
-#if defined(ENABLE_CLIENT_BASED_GEOLOCATION)
-WebKit::WebGeolocationClient* RenderView::geolocationClient()
-{
-  if (!geolocation_dispatcher_.get())
-    geolocation_dispatcher_.reset(new GeolocationDispatcher(this));
-  return geolocation_dispatcher_.get();
-}
-#else
 WebKit::WebGeolocationService* RenderView::geolocationService() {
   if (!geolocation_dispatcher_.get())
     geolocation_dispatcher_.reset(new GeolocationDispatcherOld(this));
   return geolocation_dispatcher_.get();
 }
-#endif
 
 WebKit::WebSpeechInputController* RenderView::speechInputController(
     WebKit::WebSpeechInputListener* listener) {
   if (!speech_input_dispatcher_.get())
     speech_input_dispatcher_.reset(new SpeechInputDispatcher(this, listener));
   return speech_input_dispatcher_.get();
 }
 
 WebKit::WebDeviceOrientationClient* RenderView::deviceOrientationClient() {
   if (!device_orientation_dispatcher_.get())
@@ skipping 96 matching lines @@
   external_popup_menu_.reset();
 }
 #endif
 
 void RenderView::AddErrorToRootConsole(const string16& message) {
   if (webview() && webview()->mainFrame()) {
     webview()->mainFrame()->addMessageToConsole(
         WebConsoleMessage(WebConsoleMessage::LevelError, message));
   }
 }