Introduce RenderView::Observer interface so that RenderView doesn't have to k...

chrome/renderer/geolocation_dispatcher.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/geolocation_dispatcher.h"
 
-#include "chrome/renderer/render_view.h"
-#include "ipc/ipc_message.h"
+#include "chrome/common/render_messages.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebGeolocationPermissionRequest.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebGeolocationPermissionRequestManager.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebGeolocationClient.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebGeolocationPosition.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebGeolocationError.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebSecurityOrigin.h"
 
 using namespace WebKit;
 
 GeolocationDispatcher::GeolocationDispatcher(RenderView* render_view)
-    : render_view_(render_view),
+    : RenderViewObserver(render_view),
       pending_permissions_(new WebGeolocationPermissionRequestManager()),
       enable_high_accuracy_(false),
       updating_(false) {
 }
 
 GeolocationDispatcher::~GeolocationDispatcher() {}
 
 bool GeolocationDispatcher::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(GeolocationDispatcher, message)
     IPC_MESSAGE_HANDLER(ViewMsg_Geolocation_PermissionSet,
                         OnGeolocationPermissionSet)
     IPC_MESSAGE_HANDLER(ViewMsg_Geolocation_PositionUpdated,
                         OnGeolocationPositionUpdated)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void GeolocationDispatcher::geolocationDestroyed() {
   controller_.reset();
   DCHECK(!updating_);
 }
 
 void GeolocationDispatcher::startUpdating() {
   GURL url;
-  render_view_->Send(new ViewHostMsg_Geolocation_StartUpdating(
-      render_view_->routing_id(), url, enable_high_accuracy_));
+  Send(new ViewHostMsg_Geolocation_StartUpdating(
+      routing_id(), url, enable_high_accuracy_));
   updating_ = true;
 }
 
 void GeolocationDispatcher::stopUpdating() {
-  render_view_->Send(new ViewHostMsg_Geolocation_StopUpdating(
-      render_view_->routing_id()));
+  Send(new ViewHostMsg_Geolocation_StopUpdating(routing_id()));
   updating_ = false;
 }
 
 void GeolocationDispatcher::setEnableHighAccuracy(bool enable_high_accuracy) {
   // GeolocationController calls setEnableHighAccuracy(true) before
   // startUpdating in response to the first high-accuracy Geolocation
   // subscription. When the last high-accuracy Geolocation unsubscribes
   // it calls setEnableHighAccuracy(false) after stopUpdating.
   bool has_changed = enable_high_accuracy_ != enable_high_accuracy;
   enable_high_accuracy_ = enable_high_accuracy;
@@ skipping 14 matching lines @@
   // receives, so there is not much benefit to more position caching here.
   return false;
 }
 
 // TODO(jknotten): Change the messages to use a security origin, so no
 // conversion is necessary.
 void GeolocationDispatcher::requestPermission(
     const WebGeolocationPermissionRequest& permissionRequest) {
   int bridge_id = pending_permissions_->add(permissionRequest);
   string16 origin = permissionRequest.securityOrigin().toString();
-  render_view_->Send(new ViewHostMsg_Geolocation_RequestPermission(
-      render_view_->routing_id(), bridge_id, GURL(origin)));
+  Send(new ViewHostMsg_Geolocation_RequestPermission(
+      routing_id(), bridge_id, GURL(origin)));
 }
 
 // TODO(jknotten): Change the messages to use a security origin, so no
 // conversion is necessary.
 void GeolocationDispatcher::cancelPermissionRequest(
     const WebGeolocationPermissionRequest& permissionRequest) {
   int bridge_id;
   if (!pending_permissions_->remove(permissionRequest, bridge_id))
     return;
   string16 origin = permissionRequest.securityOrigin().toString();
-  render_view_->Send(new ViewHostMsg_Geolocation_CancelPermissionRequest(
-      render_view_->routing_id(), bridge_id, GURL(origin)));
+  Send(new ViewHostMsg_Geolocation_CancelPermissionRequest(
+      routing_id(), bridge_id, GURL(origin)));
 }
 
 // Permission for using geolocation has been set.
 void GeolocationDispatcher::OnGeolocationPermissionSet(
     int bridge_id, bool is_allowed) {
   WebGeolocationPermissionRequest permissionRequest;
   if (!pending_permissions_->remove(bridge_id, permissionRequest))
     return;
   permissionRequest.setIsAllowed(is_allowed);
 }
@@ skipping 26 matching lines @@
       default:
         DCHECK(false);
         NOTREACHED() << geoposition.error_code;
         return;
     }
     controller_->errorOccurred(
         WebGeolocationError(
             code, WebKit::WebString::fromUTF8(geoposition.error_message)));
   }
 }