Index: content/browser/frame_host/render_frame_host_impl.cc |
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc |
index c1fbc30751fa6b22f331fc66ac17e5ffbdd316de..3a6791000aaa3343efdf4128b9df85df1bae17bd 100644 |
--- a/content/browser/frame_host/render_frame_host_impl.cc |
+++ b/content/browser/frame_host/render_frame_host_impl.cc |
@@ -7,10 +7,12 @@ |
#include "base/containers/hash_tables.h" |
#include "base/lazy_instance.h" |
#include "content/browser/frame_host/frame_tree.h" |
+#include "content/browser/frame_host/navigator.h" |
#include "content/browser/renderer_host/render_view_host_impl.h" |
#include "content/common/frame_messages.h" |
#include "content/public/browser/browser_thread.h" |
#include "content/public/browser/render_process_host.h" |
+#include "content/public/browser/site_instance.h" |
#include "url/gurl.h" |
namespace content { |
@@ -34,10 +36,12 @@ RenderFrameHostImpl* RenderFrameHostImpl::FromID( |
RenderFrameHostImpl::RenderFrameHostImpl( |
RenderViewHostImpl* render_view_host, |
FrameTree* frame_tree, |
+ Navigator* navigator, |
int routing_id, |
bool is_swapped_out) |
: render_view_host_(render_view_host), |
frame_tree_(frame_tree), |
+ navigator_(navigator), |
routing_id_(routing_id), |
is_swapped_out_(is_swapped_out) { |
GetProcess()->AddRoute(routing_id_, this); |
@@ -79,6 +83,13 @@ RenderProcessHost* RenderFrameHostImpl::GetProcess() const { |
return render_view_host_->GetProcess(); |
} |
+SiteInstance* RenderFrameHostImpl::GetSiteInstance() const { |
+ // TODO(nasko): This should return the RenderFrameHostImpl's SiteInstance, |
+ // but it is not implemented yet, so return the one for the associated |
+ // RenderViewHost. |
+ return render_view_host_->GetSiteInstance(); |
+} |
+ |
void RenderFrameHostImpl::OnCreateChildFrame(int new_frame_routing_id, |
int64 parent_frame_id, |
int64 frame_id, |
@@ -96,8 +107,8 @@ void RenderFrameHostImpl::OnDidStartProvisionalLoadForFrame( |
int64 parent_frame_id, |
bool is_main_frame, |
const GURL& url) { |
- render_view_host_->OnDidStartProvisionalLoadForFrame( |
- frame_id, parent_frame_id, is_main_frame, url); |
+ navigator_->DidStartProvisionalLoad( |
+ this, frame_id, parent_frame_id, is_main_frame, url); |
} |
} // namespace content |