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

Unified Diff: content/browser/frame_host/frame_tree_node.cc

Issue 1153193011: PlzNavigate: send Javascript urls synchronously to the renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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/frame_tree_node.cc
diff --git a/content/browser/frame_host/frame_tree_node.cc b/content/browser/frame_host/frame_tree_node.cc
index 08254c9d2d44aafdbfd321f9c38e379bde819bee..208cf8916c885c5ae7e3eb2a17a5dc4c5545b66f 100644
--- a/content/browser/frame_host/frame_tree_node.cc
+++ b/content/browser/frame_host/frame_tree_node.cc
@@ -186,7 +186,9 @@ bool FrameTreeNode::IsLoading() const {
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableBrowserSideNavigation)) {
- if (navigation_request_)
+ if (navigation_request_ &&
+ !navigation_request_->common_params().url.SchemeIs(
+ url::kJavaScriptScheme))
nasko 2015/05/29 14:17:46 Why not keep it closer to existing functionality?
clamy 2015/05/29 16:02:06 We cannot use a RFH to set the loading state as we
nasko 2015/06/01 20:38:22 Do we even create NavigationRequest objects for JS
clamy 2015/06/02 12:28:16 After further thinking, I removed this part, and n
return true;
} else {
if (pending_frame_host && pending_frame_host->is_loading())
« no previous file with comments | « no previous file | content/browser/frame_host/navigation_request.cc » ('j') | content/browser/frame_host/navigator_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698