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

Unified Diff: content/browser/frame_host/render_frame_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/frame_host/render_frame_host_impl.h
diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h
index 64864cb10789da9e49a2007ac7a7549bc02630ff..7f1c04c1f6f5e0c5930df66416096394a37531fd 100644
--- a/content/browser/frame_host/render_frame_host_impl.h
+++ b/content/browser/frame_host/render_frame_host_impl.h
@@ -97,6 +97,7 @@ class CONTENT_EXPORT RenderFrameHostImpl : public RenderFrameHost {
bool is_swapped_out);
private:
+ friend class TestRenderFrameHost;
friend class TestRenderViewHost;
// IPC Message handlers.
@@ -110,9 +111,15 @@ class CONTENT_EXPORT RenderFrameHostImpl : public RenderFrameHost {
void OnDidRedirectProvisionalLoad(int32 page_id,
const GURL& source_url,
const GURL& target_url);
+ void OnNavigate(const IPC::Message& msg);
void OnSwapOutACK();
void OnContextMenu(const ContextMenuParams& params);
+ // 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);
+
// For now, RenderFrameHosts indirectly keep RenderViewHosts alive via a
// refcount that calls Shutdown when it reaches zero. This allows each
// RenderFrameHostManager to just care about RenderFrameHosts, while ensuring

Powered by Google App Engine
This is Rietveld 408576698