| 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/navigator_impl.h" | 5 #include "content/browser/frame_host/navigator_impl.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/time/time.h" | 8 #include "base/time/time.h" |
| 9 #include "content/browser/frame_host/frame_tree.h" | 9 #include "content/browser/frame_host/frame_tree.h" |
| 10 #include "content/browser/frame_host/frame_tree_node.h" | 10 #include "content/browser/frame_host/frame_tree_node.h" |
| (...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 335 << " characters."; | 335 << " characters."; |
| 336 return false; | 336 return false; |
| 337 } | 337 } |
| 338 | 338 |
| 339 // This will be used to set the Navigation Timing API navigationStart | 339 // This will be used to set the Navigation Timing API navigationStart |
| 340 // parameter for browser navigations in new tabs (intents, tabs opened through | 340 // parameter for browser navigations in new tabs (intents, tabs opened through |
| 341 // "Open link in new tab"). We need to keep it above RFHM::Navigate() call to | 341 // "Open link in new tab"). We need to keep it above RFHM::Navigate() call to |
| 342 // capture the time needed for the RenderFrameHost initialization. | 342 // capture the time needed for the RenderFrameHost initialization. |
| 343 base::TimeTicks navigation_start = base::TimeTicks::Now(); | 343 base::TimeTicks navigation_start = base::TimeTicks::Now(); |
| 344 | 344 |
| 345 // WebContents uses this to fill LoadNotificationDetails when the load | |
| 346 // completes, so that PerformanceMonitor that listens to the notification can | |
| 347 // record the load time. PerformanceMonitor is no longer maintained. | |
| 348 // TODO(ppi): make this go away. | |
| 349 current_load_start_ = base::TimeTicks::Now(); | |
| 350 | |
| 351 // Create the navigation parameters. | 345 // Create the navigation parameters. |
| 352 FrameMsg_Navigate_Params navigate_params; | 346 FrameMsg_Navigate_Params navigate_params; |
| 353 MakeNavigateParams( | 347 MakeNavigateParams( |
| 354 entry, *controller_, reload_type, navigation_start, &navigate_params); | 348 entry, *controller_, reload_type, navigation_start, &navigate_params); |
| 355 | 349 |
| 356 RenderFrameHostManager* manager = | 350 RenderFrameHostManager* manager = |
| 357 render_frame_host->frame_tree_node()->render_manager(); | 351 render_frame_host->frame_tree_node()->render_manager(); |
| 358 | 352 |
| 359 // PlzNavigate: the RenderFrameHosts are no longer asked to navigate. Instead | 353 // PlzNavigate: the RenderFrameHosts are no longer asked to navigate. Instead |
| 360 // the RenderFrameHostManager handles the navigation requests for that frame | 354 // the RenderFrameHostManager handles the navigation requests for that frame |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 422 | 416 |
| 423 bool NavigatorImpl::NavigateToPendingEntry( | 417 bool NavigatorImpl::NavigateToPendingEntry( |
| 424 RenderFrameHostImpl* render_frame_host, | 418 RenderFrameHostImpl* render_frame_host, |
| 425 NavigationController::ReloadType reload_type) { | 419 NavigationController::ReloadType reload_type) { |
| 426 return NavigateToEntry( | 420 return NavigateToEntry( |
| 427 render_frame_host, | 421 render_frame_host, |
| 428 *NavigationEntryImpl::FromNavigationEntry(controller_->GetPendingEntry()), | 422 *NavigationEntryImpl::FromNavigationEntry(controller_->GetPendingEntry()), |
| 429 reload_type); | 423 reload_type); |
| 430 } | 424 } |
| 431 | 425 |
| 432 base::TimeTicks NavigatorImpl::GetCurrentLoadStart() { | |
| 433 return current_load_start_; | |
| 434 } | |
| 435 | |
| 436 void NavigatorImpl::DidNavigate( | 426 void NavigatorImpl::DidNavigate( |
| 437 RenderFrameHostImpl* render_frame_host, | 427 RenderFrameHostImpl* render_frame_host, |
| 438 const FrameHostMsg_DidCommitProvisionalLoad_Params& input_params) { | 428 const FrameHostMsg_DidCommitProvisionalLoad_Params& input_params) { |
| 439 FrameHostMsg_DidCommitProvisionalLoad_Params params(input_params); | 429 FrameHostMsg_DidCommitProvisionalLoad_Params params(input_params); |
| 440 FrameTree* frame_tree = render_frame_host->frame_tree_node()->frame_tree(); | 430 FrameTree* frame_tree = render_frame_host->frame_tree_node()->frame_tree(); |
| 441 bool use_site_per_process = base::CommandLine::ForCurrentProcess()->HasSwitch( | 431 bool use_site_per_process = base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 442 switches::kSitePerProcess); | 432 switches::kSitePerProcess); |
| 443 | 433 |
| 444 if (use_site_per_process) { | 434 if (use_site_per_process) { |
| 445 // TODO(creis): Until we mirror the frame tree in the subframe's process, | 435 // TODO(creis): Until we mirror the frame tree in the subframe's process, |
| (...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 681 controller_->GetBrowserContext(), url); | 671 controller_->GetBrowserContext(), url); |
| 682 if ((enabled_bindings & BINDINGS_POLICY_WEB_UI) && | 672 if ((enabled_bindings & BINDINGS_POLICY_WEB_UI) && |
| 683 !is_allowed_in_web_ui_renderer) { | 673 !is_allowed_in_web_ui_renderer) { |
| 684 // Log the URL to help us diagnose any future failures of this CHECK. | 674 // Log the URL to help us diagnose any future failures of this CHECK. |
| 685 GetContentClient()->SetActiveURL(url); | 675 GetContentClient()->SetActiveURL(url); |
| 686 CHECK(0); | 676 CHECK(0); |
| 687 } | 677 } |
| 688 } | 678 } |
| 689 | 679 |
| 690 } // namespace content | 680 } // namespace content |
| OLD | NEW |