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

Side by Side Diff: content/browser/frame_host/navigator_impl.cc

Issue 689123003: Revert of Navigation transitions (web to native app): Pass data after starting provisional load ... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 unified diff | Download patch
OLDNEW
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
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 TransitionLayerData transition_data; 259 delegate_->DidStartNavigationTransition(render_frame_host);
260 TransitionRequestManager::GetInstance()->GetPendingTransitionRequest(
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 }
268 } 260 }
269 261
270 if (delegate_) { 262 if (delegate_) {
271 // Notify the observer about the start of the provisional load. 263 // Notify the observer about the start of the provisional load.
272 delegate_->DidStartProvisionalLoad( 264 delegate_->DidStartProvisionalLoad(
273 render_frame_host, validated_url, is_error_page, is_iframe_srcdoc); 265 render_frame_host, validated_url, is_error_page, is_iframe_srcdoc);
274 } 266 }
275 } 267 }
276 268
277 269
(...skipping 641 matching lines...) Expand 10 before | Expand all | Expand 10 after
919 "Navigation.TimeToCommit_ExistingRenderer_BeforeUnloadDiscounted", 911 "Navigation.TimeToCommit_ExistingRenderer_BeforeUnloadDiscounted",
920 time_to_commit); 912 time_to_commit);
921 UMA_HISTOGRAM_TIMES( 913 UMA_HISTOGRAM_TIMES(
922 "Navigation.TimeToURLJobStart_ExistingRenderer_BeforeUnloadDiscounted", 914 "Navigation.TimeToURLJobStart_ExistingRenderer_BeforeUnloadDiscounted",
923 time_to_network); 915 time_to_network);
924 } 916 }
925 navigation_data_.reset(); 917 navigation_data_.reset();
926 } 918 }
927 919
928 } // namespace content 920 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/navigator_delegate.h ('k') | content/browser/loader/cross_site_resource_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698