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

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

Issue 182713005: Remove frame ID from DidCommitProvisionalLoad. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix John's comments and signin test Created 6 years, 10 months 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 4be5af907b09440a12d1ebdd1ed4a824642af5dd..00b83972dcae8df907e81bd10c20a948828a5bc1 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -80,6 +80,10 @@ RenderFrameHostImpl::~RenderFrameHostImpl() {
frame_tree_->UnregisterRenderFrameHost(this);
}
+int RenderFrameHostImpl::GetRoutingID() {
+ return routing_id_;
+}
+
SiteInstance* RenderFrameHostImpl::GetSiteInstance() {
return render_view_host_->GetSiteInstance();
}
@@ -90,10 +94,6 @@ RenderProcessHost* RenderFrameHostImpl::GetProcess() {
return render_view_host_->GetProcess();
}
-int RenderFrameHostImpl::GetRoutingID() {
- return routing_id_;
-}
-
RenderFrameHost* RenderFrameHostImpl::GetParent() {
FrameTreeNode* parent_node = frame_tree_node_->parent();
if (!parent_node)
@@ -309,6 +309,10 @@ void RenderFrameHostImpl::OnNavigate(const IPC::Message& msg) {
frame_tree_node()->navigator()->DidNavigate(this, validated_params);
}
+int RenderFrameHostImpl::GetEnabledBindings() {
+ return render_view_host_->GetEnabledBindings();
+}
+
void RenderFrameHostImpl::SwapOut() {
if (render_view_host_->IsRenderViewLive()) {
Send(new FrameMsg_SwapOut(routing_id_));

Powered by Google App Engine
This is Rietveld 408576698