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

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: 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..7b076c22322fd22a78a4a94727665fa323ce12da 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -80,28 +80,32 @@ RenderFrameHostImpl::~RenderFrameHostImpl() {
frame_tree_->UnregisterRenderFrameHost(this);
}
-SiteInstance* RenderFrameHostImpl::GetSiteInstance() {
+int RenderFrameHostImpl::GetRoutingID() const {
+ return routing_id_;
+}
+
+SiteInstance* RenderFrameHostImpl::GetSiteInstance() const {
return render_view_host_->GetSiteInstance();
}
-RenderProcessHost* RenderFrameHostImpl::GetProcess() {
+int RenderFrameHostImpl::GetEnabledBindings() const {
+ return render_view_host_->GetEnabledBindings();
+}
+
+RenderProcessHost* RenderFrameHostImpl::GetProcess() const {
// TODO(nasko): This should return its own process, once we have working
// cross-process navigation for subframes.
return render_view_host_->GetProcess();
}
-int RenderFrameHostImpl::GetRoutingID() {
- return routing_id_;
-}
-
-RenderFrameHost* RenderFrameHostImpl::GetParent() {
+RenderFrameHost* RenderFrameHostImpl::GetParent() const {
FrameTreeNode* parent_node = frame_tree_node_->parent();
if (!parent_node)
return NULL;
return parent_node->current_frame_host();
}
-bool RenderFrameHostImpl::IsCrossProcessSubframe() {
+bool RenderFrameHostImpl::IsCrossProcessSubframe() const {
FrameTreeNode* parent_node = frame_tree_node_->parent();
if (!parent_node)
return false;
@@ -109,11 +113,11 @@ bool RenderFrameHostImpl::IsCrossProcessSubframe() {
parent_node->current_frame_host()->GetSiteInstance();
}
-GURL RenderFrameHostImpl::GetLastCommittedURL() {
+GURL RenderFrameHostImpl::GetLastCommittedURL() const {
return frame_tree_node_->current_url();
}
-gfx::NativeView RenderFrameHostImpl::GetNativeView() {
+gfx::NativeView RenderFrameHostImpl::GetNativeView() const {
RenderWidgetHostView* view = render_view_host_->GetView();
if (!view)
return NULL;
@@ -130,7 +134,7 @@ void RenderFrameHostImpl::ExecuteCustomContextMenuCommand(
Send(new FrameMsg_CustomContextMenuAction(routing_id_, context, action));
}
-RenderViewHost* RenderFrameHostImpl::GetRenderViewHost() {
+RenderViewHost* RenderFrameHostImpl::GetRenderViewHost() const {
return render_view_host_;
}

Powered by Google App Engine
This is Rietveld 408576698