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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 1182453002: PlzNavigate: support for should_replace_current_entry (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Dropped the settint of the load type Created 5 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/containers/hash_tables.h" 9 #include "base/containers/hash_tables.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 1688 matching lines...) Expand 10 before | Expand all | Expand 10 after
1699 // 1699 //
1700 // Blink doesn't send throb notifications for JavaScript URLs, so it is not 1700 // Blink doesn't send throb notifications for JavaScript URLs, so it is not
1701 // done here either. 1701 // done here either.
1702 if (!common_params.url.SchemeIs(url::kJavaScriptScheme)) 1702 if (!common_params.url.SchemeIs(url::kJavaScriptScheme))
1703 frame_tree_node_->DidStartLoading(true); 1703 frame_tree_node_->DidStartLoading(true);
1704 } 1704 }
1705 1705
1706 void RenderFrameHostImpl::NavigateToURL(const GURL& url) { 1706 void RenderFrameHostImpl::NavigateToURL(const GURL& url) {
1707 CommonNavigationParams common_params( 1707 CommonNavigationParams common_params(
1708 url, Referrer(), ui::PAGE_TRANSITION_LINK, FrameMsg_Navigate_Type::NORMAL, 1708 url, Referrer(), ui::PAGE_TRANSITION_LINK, FrameMsg_Navigate_Type::NORMAL,
1709 true, base::TimeTicks::Now(), FrameMsg_UILoadMetricsReportType::NO_REPORT, 1709 true, false, base::TimeTicks::Now(),
1710 GURL(), GURL()); 1710 FrameMsg_UILoadMetricsReportType::NO_REPORT, GURL(), GURL());
1711 Navigate(common_params, StartNavigationParams(), RequestNavigationParams()); 1711 Navigate(common_params, StartNavigationParams(), RequestNavigationParams());
1712 } 1712 }
1713 1713
1714 void RenderFrameHostImpl::OpenURL(const FrameHostMsg_OpenURL_Params& params, 1714 void RenderFrameHostImpl::OpenURL(const FrameHostMsg_OpenURL_Params& params,
1715 SiteInstance* source_site_instance) { 1715 SiteInstance* source_site_instance) {
1716 GURL validated_url(params.url); 1716 GURL validated_url(params.url);
1717 GetProcess()->FilterURL(false, &validated_url); 1717 GetProcess()->FilterURL(false, &validated_url);
1718 1718
1719 TRACE_EVENT1("navigation", "RenderFrameHostImpl::OpenURL", "url", 1719 TRACE_EVENT1("navigation", "RenderFrameHostImpl::OpenURL", "url",
1720 validated_url.possibly_invalid_spec()); 1720 validated_url.possibly_invalid_spec());
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
2166 ChildProcessSecurityPolicyImpl::GetInstance()->HasWebUIBindings( 2166 ChildProcessSecurityPolicyImpl::GetInstance()->HasWebUIBindings(
2167 GetProcess()->GetID()) || 2167 GetProcess()->GetID()) ||
2168 // It's possible to load about:blank in a Web UI renderer. 2168 // It's possible to load about:blank in a Web UI renderer.
2169 // See http://crbug.com/42547 2169 // See http://crbug.com/42547
2170 (frame_tree_node_->current_url().spec() == url::kAboutBlankURL) || 2170 (frame_tree_node_->current_url().spec() == url::kAboutBlankURL) ||
2171 // InterstitialPageImpl should be the only case matching this. 2171 // InterstitialPageImpl should be the only case matching this.
2172 (delegate_->GetAsWebContents() == nullptr); 2172 (delegate_->GetAsWebContents() == nullptr);
2173 } 2173 }
2174 2174
2175 } // namespace content 2175 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698