Rename RenderView to RenderViewImpl. Update Chrome's DEPS so that it can't include the RenderView implementation.

BUG=98716
Review URL: http://codereview.chromium.org/8220006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104754 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 20 insertions, 21 deletions

diff --git a/content/public/renderer/DEPS b/content/public/renderer/DEPS
index d472a18..c4098ab 100644
--- a/content/public/renderer/DEPS
+++ b/content/public/renderer/DEPS
@@ -1,4 +1,4 @@
 include_rules = [
-  "+content/renderer/render_view.h",
+  "+content/renderer/render_view_impl.h",
   "+v8/include/v8.h",
 ]
diff --git a/content/public/renderer/render_view_observer.cc b/content/public/renderer/render_view_observer.cc
index 980985c..371f7ff 100644
--- a/content/public/renderer/render_view_observer.cc
+++ b/content/public/renderer/render_view_observer.cc
@@ -4,30 +4,28 @@
 
 #include "content/public/renderer/render_view_observer.h"
 
-#include "content/renderer/render_view.h"
+#include "content/renderer/render_view_impl.h"
 
 using WebKit::WebFrame;
 
-// TODO(jam): temporary until RenderView is renamed to RenderViewImpl since
-// trying ::RenderView* below gives compile errors in gcc.
-typedef RenderView RenderViewImpl;
-
 namespace content {
 
 RenderViewObserver::RenderViewObserver(RenderView* render_view)
-    : render_view_(NULL),
+    : render_view_(render_view),
       routing_id_(MSG_ROUTING_NONE) {
   // |render_view| can be NULL on unit testing.
   if (render_view) {
-    render_view_ = static_cast<RenderViewImpl*>(render_view);
-    routing_id_ = render_view_->routing_id();
-    render_view_->AddObserver(this);
+    RenderViewImpl* impl = static_cast<RenderViewImpl*>(render_view);
+    routing_id_ = impl->routing_id();
+    impl->AddObserver(this);
   }
 }
 
 RenderViewObserver::~RenderViewObserver() {
-  if (render_view_)
-    render_view_->RemoveObserver(this);
+  if (render_view_) {
+    RenderViewImpl* impl = static_cast<RenderViewImpl*>(render_view_);
+    impl->RemoveObserver(this);
+  }
 }
 
 void RenderViewObserver::OnDestruct() {
@@ -50,8 +48,8 @@ RenderView* RenderViewObserver::render_view() {
   return render_view_;
 }
 
-void RenderViewObserver::set_render_view(::RenderView* rv) {
-  render_view_ = rv;
+void RenderViewObserver::RenderViewGone() {
+  render_view_ = NULL;
 }
 
 }  // namespace content
diff --git a/content/public/renderer/render_view_observer.h b/content/public/renderer/render_view_observer.h
index e6608a4..89ae86e 100644
--- a/content/public/renderer/render_view_observer.h
+++ b/content/public/renderer/render_view_observer.h
@@ -79,13 +79,17 @@ class CONTENT_EXPORT RenderViewObserver : public IPC::Channel::Listener,
   virtual void ContextMenuAction(unsigned id) {}
   virtual void Navigate(const GURL& url) {}
 
+  // IPC::Channel::Listener implementation.
+  virtual bool OnMessageReceived(const IPC::Message& message);
+
+  // This is called by the RenderView when it's going away so that this object
+  // can null out its pointer.
+  void RenderViewGone();
+
  protected:
   explicit RenderViewObserver(RenderView* render_view);
   virtual ~RenderViewObserver();
 
-  // IPC::Channel::Listener implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message);
-
   // IPC::Message::Sender implementation.
   virtual bool Send(IPC::Message* message);
 
@@ -93,11 +97,8 @@ class CONTENT_EXPORT RenderViewObserver : public IPC::Channel::Listener,
   int routing_id() { return routing_id_; }
 
  private:
-  friend class ::RenderView;
-
-  void set_render_view(::RenderView* rv);
 
-  ::RenderView* render_view_;
+  RenderView* render_view_;
   // The routing ID of the associated RenderView.
   int routing_id_;