Separate RenderViewHost from RenderWidgetHost, part 2: public implementation.

content/browser/renderer_host/render_view_host_impl.cc

 // Copyright (c) 2012 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 "content/browser/renderer_host/render_view_host_impl.h"
 
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 159 matching lines @@
 // RenderViewHost, public:
 
 // static
 RenderViewHost* RenderViewHost::FromID(int render_process_id,
                                        int render_view_id) {
   return RenderViewHostImpl::FromID(render_process_id, render_view_id);
 }
 
 // static
 RenderViewHost* RenderViewHost::From(RenderWidgetHost* rwh) {
-  DCHECK(rwh->IsRenderView());
-  return static_cast<RenderViewHostImpl*>(RenderWidgetHostImpl::From(rwh));
+  return RenderViewHostImpl::From(rwh);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // RenderViewHostImpl, public:
 
 // static
 RenderViewHostImpl* RenderViewHostImpl::FromID(int render_process_id,
                                                int render_view_id) {
   RenderWidgetHost* widget =
       RenderWidgetHost::FromID(render_process_id, render_view_id);
   if (!widget || !widget->IsRenderView())
     return NULL;
   return static_cast<RenderViewHostImpl*>(RenderWidgetHostImpl::From(widget));
 }
 
+// static
+RenderViewHostImpl* RenderViewHostImpl::From(RenderWidgetHost* rwh) {
+  DCHECK(rwh->IsRenderView());
+  return static_cast<RenderViewHostImpl*>(RenderWidgetHostImpl::From(rwh));
+}
+
 RenderViewHostImpl::RenderViewHostImpl(
     SiteInstance* instance,
     RenderViewHostDelegate* delegate,
     RenderWidgetHostDelegate* widget_delegate,
     int32 routing_id,
     int32 main_frame_routing_id,
     bool swapped_out,
     bool hidden,
     bool has_initialized_audio_host)
     : RenderWidgetHostImpl(widget_delegate,
@@ skipping 524 matching lines @@
 }
 
 void RenderViewHostImpl::DragSourceSystemDragEnded() {
   Send(new DragMsg_SourceSystemDragEnded(GetRoutingID()));
 }
 
 bool RenderViewHostImpl::Send(IPC::Message* msg) {
   return RenderWidgetHostImpl::Send(msg);
 }
 
-RenderWidgetHost* RenderViewHostImpl::GetWidget() const {
-  return const_cast<RenderWidgetHost*>(
-      static_cast<const RenderWidgetHost*>(this));
+RenderWidgetHostImpl* RenderViewHostImpl::GetWidget() const {
+  return const_cast<RenderWidgetHostImpl*>(
+      static_cast<const RenderWidgetHostImpl*>(this));
 }
 
 RenderProcessHost* RenderViewHostImpl::GetProcess() const {
   return RenderWidgetHostImpl::GetProcess();
 }
 
 int RenderViewHostImpl::GetRoutingID() const {
   return RenderWidgetHostImpl::GetRoutingID();
 }
 
@@ skipping 704 matching lines @@
   } else {
     render_view_ready_on_process_launch_ = true;
   }
 }
 
 void RenderViewHostImpl::RenderViewReady() {
   delegate_->RenderViewReady(this);
 }
 
 }  // namespace content