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

Unified Diff: content/browser/renderer_host/render_view_host_impl.h

Issue 135723003: Move DidCommitProvisionalLoad code from RenderView to RenderFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed unit tests and removed WebContents::DidNavigate 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/renderer_host/render_view_host_impl.h
diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
index f185fad883b99ad10431dafa1c058a73a38ca44a..de8e0d077594a688646ee5f94e3a4b7a33e3320a 100644
--- a/content/browser/renderer_host/render_view_host_impl.h
+++ b/content/browser/renderer_host/render_view_host_impl.h
@@ -418,6 +418,9 @@ class CONTENT_EXPORT RenderViewHostImpl
int64 main_frame_id() const {
return main_frame_id_;
}
+ int main_frame_routing_id() const {
+ return main_frame_routing_id_;
+ }
// Set the opener to null in the renderer process.
void DisownOpener();
@@ -454,11 +457,6 @@ class CONTENT_EXPORT RenderViewHostImpl
return is_waiting_for_unload_ack_;
}
- // Returns whether the given URL is allowed to commit in the current process.
- // This is a more conservative check than RenderProcessHost::FilterURL, since
- // it will be used to kill processes that commit unauthorized URLs.
- bool CanCommitURL(const GURL& url);
-
// Update the FrameTree to use this RenderViewHost's main frame
// RenderFrameHost. Called when the RenderViewHost is committed.
//
@@ -587,6 +585,10 @@ class CONTENT_EXPORT RenderViewHostImpl
#endif
private:
+ // TODO(nasko): Temporarily friend RenderFrameHostImpl, so we don't duplicate
+ // utility functions and state needed in both classes, while we move frame
+ // specific code away from this class.
+ friend class RenderFrameHostImpl;
friend class TestRenderViewHost;
FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, BasicRenderFrameHost);
FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, RoutingIdSane);

Powered by Google App Engine
This is Rietveld 408576698