Make RenderView inherit from content::RenderView, and add missing functions to the interface. In a future change I'll rename RenderView to RenderViewImpl.

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

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

2 files changed, 11 insertions, 12 deletions

diff --git a/chrome/renderer/prerender/prerender_helper.cc b/chrome/renderer/prerender/prerender_helper.cc
index e64fede..58eb2f4 100644
--- a/chrome/renderer/prerender/prerender_helper.cc
+++ b/chrome/renderer/prerender/prerender_helper.cc
@@ -8,7 +8,7 @@
 #include "base/metrics/histogram.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/renderer/navigation_state.h"
-#include "content/renderer/render_view.h"
+#include "content/public/renderer/render_view.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 
@@ -27,7 +27,7 @@ using content::NavigationState;
 
 namespace prerender {
 
-PrerenderHelper::PrerenderHelper(RenderView* render_view)
+PrerenderHelper::PrerenderHelper(content::RenderView* render_view)
     : content::RenderViewObserver(render_view),
       content::RenderViewObserverTracker<PrerenderHelper>(render_view),
       is_prerendering_(true),
@@ -39,14 +39,14 @@ PrerenderHelper::~PrerenderHelper() {
 }
 
 // static.
-bool PrerenderHelper::IsPrerendering(const RenderView* render_view) {
+bool PrerenderHelper::IsPrerendering(const content::RenderView* render_view) {
   PrerenderHelper* prerender_helper = PrerenderHelper::Get(render_view);
   return (prerender_helper && prerender_helper->is_prerendering_);
 }
 
 // static.
 void PrerenderHelper::RecordHistograms(
-    RenderView* render_view,
+    content::RenderView* render_view,
     const base::Time& finish_all_loads,
     const base::TimeDelta& begin_to_finish_all_loads) {
   static bool use_prerender_histogram =
@@ -117,7 +117,7 @@ void PrerenderHelper::WillCreateMediaPlayer(
     // Cancel prerendering in the case of HTML5 media, to avoid playing sounds
     // in the background.
     Send(new ChromeViewHostMsg_MaybeCancelPrerenderForHTML5Media(
-         render_view()->routing_id()));
+        render_view()->GetRoutingId()));
   }
 }
 
@@ -167,10 +167,9 @@ bool PrerenderHelper::HasUnrecordedData() const {
 }
 
 void PrerenderHelper::UpdateVisibilityState() {
-  if (render_view()->webview()) {
-    render_view()->webview()->setVisibilityState(
-        render_view()->visibilityState(),
-        false);
+  if (render_view()->GetWebView()) {
+    render_view()->GetWebView()->setVisibilityState(
+        render_view()->GetVisibilityState(), false);
   }
 }
 
diff --git a/chrome/renderer/prerender/prerender_helper.h b/chrome/renderer/prerender/prerender_helper.h
index 068aa36..c716d5d 100644
--- a/chrome/renderer/prerender/prerender_helper.h
+++ b/chrome/renderer/prerender/prerender_helper.h
@@ -23,16 +23,16 @@ class PrerenderHelper
     : public content::RenderViewObserver,
       public content::RenderViewObserverTracker<PrerenderHelper> {
  public:
-  explicit PrerenderHelper(RenderView* render_view);
+  explicit PrerenderHelper(content::RenderView* render_view);
   virtual ~PrerenderHelper();
 
   // Returns true if |render_view| is currently prerendering.
-  static bool IsPrerendering(const RenderView* render_view);
+  static bool IsPrerendering(const content::RenderView* render_view);
 
   // Records prerender histograms.  These are recorded even for pages that are
   // not prerendered, for comparison to pages that are.
   static void RecordHistograms(
-      RenderView* render_view,
+      content::RenderView* render_view,
       const base::Time& finish_all_loads,
       const base::TimeDelta& begin_to_finish_all_loads);