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 cabc819f4322201f2a42b9a5881e457628fcf2f2..371c9a0c656068894d8c3657278b9d40158e349c 100644 |
--- a/content/browser/frame_host/frame_tree_node.cc |
+++ b/content/browser/frame_host/frame_tree_node.cc |
@@ -185,7 +185,15 @@ void FrameTreeNode::SetNavigationRequest( |
CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch( |
switches::kEnableBrowserSideNavigation)); |
ResetNavigationRequest(false); |
- // TODO(clamy): perform the StartLoading logic here. |
+ |
+ // Force the throbber to start to keep it in sync with what is happening in |
+ // the UI. Blink doesn't send throb notifications for JavaScript URLs, so it |
+ // is not done here either. |
+ if (!navigation_request->common_params().url.SchemeIs( |
+ url::kJavaScriptScheme)) { |
clamy
2015/04/28 11:42:56
Could you add a TODO to set the boolean properly o
Fabrice (no longer in Chrome)
2015/04/28 14:40:29
Done.
|
+ DidStartLoading(true); |
+ } |
+ |
navigation_request_ = navigation_request.Pass(); |
} |
@@ -197,7 +205,7 @@ void FrameTreeNode::ResetNavigationRequest(bool is_commit) { |
// corresponds to a cancelation, the RenderFrameHostManager should clean up |
// any speculative RenderFrameHost it created for the navigation. |
if (navigation_request_ && !is_commit) { |
- // TODO(clamy): perform the StopLoading logic. |
+ DidStopLoading(); |
render_manager_.CleanUpNavigation(); |
} |
navigation_request_.reset(); |