Chromium Code Reviews| 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/metrics/histogram.h" | 8 #include "base/metrics/histogram.h" |
| 9 #include "base/time/time.h" | 9 #include "base/time/time.h" |
| 10 #include "content/browser/frame_host/frame_tree.h" | 10 #include "content/browser/frame_host/frame_tree.h" |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 248 entry->set_transferred_global_request_id( | 248 entry->set_transferred_global_request_id( |
| 249 pending_entry->transferred_global_request_id()); | 249 pending_entry->transferred_global_request_id()); |
| 250 entry->set_should_replace_entry(pending_entry->should_replace_entry()); | 250 entry->set_should_replace_entry(pending_entry->should_replace_entry()); |
| 251 entry->SetRedirectChain(pending_entry->GetRedirectChain()); | 251 entry->SetRedirectChain(pending_entry->GetRedirectChain()); |
| 252 } | 252 } |
| 253 controller_->SetPendingEntry(entry); | 253 controller_->SetPendingEntry(entry); |
| 254 if (delegate_) | 254 if (delegate_) |
| 255 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL); | 255 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL); |
| 256 } | 256 } |
| 257 | 257 |
| 258 if (delegate_ && is_transition_navigation) | 258 if (delegate_ && is_transition_navigation) { |
| 259 delegate_->DidStartNavigationTransition(render_frame_host); | 259 TransitionLayerData transition_data; |
| 260 TransitionRequestManager::GetInstance()->HasPendingTransitionRequest( | |
|
nasko
2014/10/29 22:14:24
This method name looks very weird. A Has* method s
Zhen Wang
2014/10/29 23:11:05
Done.
| |
| 261 render_frame_host->GetProcess()->GetID(), | |
| 262 render_frame_host->GetRoutingID(), | |
| 263 validated_url, | |
| 264 &transition_data); | |
| 265 delegate_->DidStartNavigationTransition(render_frame_host, | |
| 266 transition_data); | |
| 267 } | |
| 260 } | 268 } |
| 261 | 269 |
| 262 if (delegate_) { | 270 if (delegate_) { |
| 263 // Notify the observer about the start of the provisional load. | 271 // Notify the observer about the start of the provisional load. |
| 264 delegate_->DidStartProvisionalLoad( | 272 delegate_->DidStartProvisionalLoad( |
| 265 render_frame_host, validated_url, is_error_page, is_iframe_srcdoc); | 273 render_frame_host, validated_url, is_error_page, is_iframe_srcdoc); |
| 266 } | 274 } |
| 267 } | 275 } |
| 268 | 276 |
| 269 | 277 |
| (...skipping 641 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 911 "Navigation.TimeToCommit_ExistingRenderer_BeforeUnloadDiscounted", | 919 "Navigation.TimeToCommit_ExistingRenderer_BeforeUnloadDiscounted", |
| 912 time_to_commit); | 920 time_to_commit); |
| 913 UMA_HISTOGRAM_TIMES( | 921 UMA_HISTOGRAM_TIMES( |
| 914 "Navigation.TimeToURLJobStart_ExistingRenderer_BeforeUnloadDiscounted", | 922 "Navigation.TimeToURLJobStart_ExistingRenderer_BeforeUnloadDiscounted", |
| 915 time_to_network); | 923 time_to_network); |
| 916 } | 924 } |
| 917 navigation_data_.reset(); | 925 navigation_data_.reset(); |
| 918 } | 926 } |
| 919 | 927 |
| 920 } // namespace content | 928 } // namespace content |
| OLD | NEW |