Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(709)

Unified Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 26316005: Move out DidStartProvisionalLoad from WebContentsImpl into Navigator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add NavigatorDelegate Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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

Powered by Google App Engine
This is Rietveld 408576698