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

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

Issue 13846007: Allow showing pending URL for new tab navigations, but only if safe. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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.cc
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index 87aa01950694c94ec1495d6afa5d65a60911976c..bbb326a75d30582869ae98e9b9646ca8c9deac55 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -169,6 +169,7 @@ RenderViewHostImpl::RenderViewHostImpl(
pending_request_id_(-1),
navigations_suspended_(false),
suspended_nav_params_(NULL),
+ has_accessed_initial_document_(false),
is_swapped_out_(swapped_out),
is_subframe_(false),
run_modal_reply_msg_(NULL),
@@ -989,6 +990,8 @@ bool RenderViewHostImpl::OnMessageReceived(const IPC::Message& msg) {
IPC_MESSAGE_HANDLER(ViewHostMsg_ShowPopup, OnShowPopup)
#endif
IPC_MESSAGE_HANDLER(ViewHostMsg_RunFileChooser, OnRunFileChooser)
+ IPC_MESSAGE_HANDLER(ViewHostMsg_DidAccessInitialDocument,
+ OnDidAccessInitialDocument)
IPC_MESSAGE_HANDLER(ViewHostMsg_DomOperationResponse,
OnDomOperationResponse)
IPC_MESSAGE_HANDLER(AccessibilityHostMsg_Notifications,
@@ -1206,6 +1209,10 @@ void RenderViewHostImpl::OnNavigate(const IPC::Message& msg) {
}
}
+ // Now that something has committed, we don't need to track whether the
+ // initial page has been accessed.
+ has_accessed_initial_document_ = false;
+
ChildProcessSecurityPolicyImpl* policy =
ChildProcessSecurityPolicyImpl::GetInstance();
// Without this check, an evil renderer can trick the browser into creating
@@ -1998,6 +2005,11 @@ void RenderViewHostImpl::OnRunFileChooser(const FileChooserParams& params) {
delegate_->RunFileChooser(this, params);
}
+void RenderViewHostImpl::OnDidAccessInitialDocument() {
+ has_accessed_initial_document_ = true;
+ delegate_->DidAccessInitialDocument();
+}
+
void RenderViewHostImpl::OnDomOperationResponse(
const std::string& json_string, int automation_id) {
DomOperationNotificationDetails details(json_string, automation_id);

Powered by Google App Engine
This is Rietveld 408576698