OLD | NEW |
---|---|
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/frame_tree_node.h" | 5 #include "content/browser/frame_host/frame_tree_node.h" |
6 | 6 |
7 #include <queue> | 7 #include <queue> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/profiler/scoped_tracker.h" | 10 #include "base/profiler/scoped_tracker.h" |
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
212 // the UI. Blink doesn't send throb notifications for JavaScript URLs, so it | 212 // the UI. Blink doesn't send throb notifications for JavaScript URLs, so it |
213 // is not done here either. | 213 // is not done here either. |
214 if (!navigation_request->common_params().url.SchemeIs( | 214 if (!navigation_request->common_params().url.SchemeIs( |
215 url::kJavaScriptScheme)) { | 215 url::kJavaScriptScheme)) { |
216 // TODO(fdegans): Check if this is a same-document navigation and set the | 216 // TODO(fdegans): Check if this is a same-document navigation and set the |
217 // proper argument. | 217 // proper argument. |
218 DidStartLoading(true); | 218 DidStartLoading(true); |
219 } | 219 } |
220 | 220 |
221 navigation_request_ = navigation_request.Pass(); | 221 navigation_request_ = navigation_request.Pass(); |
222 | |
223 render_manager()->BeginNavigation(*navigation_request_); | |
clamy
2015/06/09 16:01:29
Please rename the function in RFHM DidSetNavigatio
carlosk
2015/06/10 11:53:08
Done.
| |
222 } | 224 } |
223 | 225 |
224 void FrameTreeNode::ResetNavigationRequest(bool is_commit) { | 226 void FrameTreeNode::ResetNavigationRequest(bool is_commit) { |
225 CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch( | 227 CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch( |
226 switches::kEnableBrowserSideNavigation)); | 228 switches::kEnableBrowserSideNavigation)); |
227 if (!navigation_request_) | 229 if (!navigation_request_) |
228 return; | 230 return; |
229 navigation_request_.reset(); | 231 navigation_request_.reset(); |
230 | 232 |
231 // During commit, the clean up of a speculative RenderFrameHost is done in | 233 // During commit, the clean up of a speculative RenderFrameHost is done in |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
300 FROM_HERE_WITH_EXPLICIT_FUNCTION( | 302 FROM_HERE_WITH_EXPLICIT_FUNCTION( |
301 "465796 FrameTreeNode::DidStopLoading::End")); | 303 "465796 FrameTreeNode::DidStopLoading::End")); |
302 } | 304 } |
303 | 305 |
304 void FrameTreeNode::DidChangeLoadProgress(double load_progress) { | 306 void FrameTreeNode::DidChangeLoadProgress(double load_progress) { |
305 loading_progress_ = load_progress; | 307 loading_progress_ = load_progress; |
306 frame_tree_->UpdateLoadProgress(); | 308 frame_tree_->UpdateLoadProgress(); |
307 } | 309 } |
308 | 310 |
309 } // namespace content | 311 } // namespace content |
OLD | NEW |