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

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

Issue 358973005: Navigation transitions: Pass is_transition_navigation flag up to the embedder (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months 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 | Annotate | Revision Log
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/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/containers/hash_tables.h" 8 #include "base/containers/hash_tables.h"
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/metrics/user_metrics_action.h" 10 #include "base/metrics/user_metrics_action.h"
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 frame_tree_->SetFocusedFrame(frame_tree_node_); 386 frame_tree_->SetFocusedFrame(frame_tree_node_);
387 } 387 }
388 388
389 void RenderFrameHostImpl::OnOpenURL( 389 void RenderFrameHostImpl::OnOpenURL(
390 const FrameHostMsg_OpenURL_Params& params) { 390 const FrameHostMsg_OpenURL_Params& params) {
391 GURL validated_url(params.url); 391 GURL validated_url(params.url);
392 GetProcess()->FilterURL(false, &validated_url); 392 GetProcess()->FilterURL(false, &validated_url);
393 393
394 frame_tree_node_->navigator()->RequestOpenURL( 394 frame_tree_node_->navigator()->RequestOpenURL(
395 this, validated_url, params.referrer, params.disposition, 395 this, validated_url, params.referrer, params.disposition,
396 params.should_replace_current_entry, params.user_gesture); 396 params.should_replace_current_entry, params.user_gesture,
397 params.is_transition_navigation);
397 } 398 }
398 399
399 void RenderFrameHostImpl::OnDocumentOnLoadCompleted() { 400 void RenderFrameHostImpl::OnDocumentOnLoadCompleted() {
400 // This message is only sent for top-level frames. TODO(avi): when frame tree 401 // This message is only sent for top-level frames. TODO(avi): when frame tree
401 // mirroring works correctly, add a check here to enforce it. 402 // mirroring works correctly, add a check here to enforce it.
402 delegate_->DocumentOnLoadCompleted(this); 403 delegate_->DocumentOnLoadCompleted(this);
403 } 404 }
404 405
405 void RenderFrameHostImpl::OnDidStartProvisionalLoadForFrame( 406 void RenderFrameHostImpl::OnDidStartProvisionalLoadForFrame(
406 int parent_routing_id, 407 int parent_routing_id,
407 const GURL& url) { 408 const GURL& url,
409 bool is_transition_navigation) {
408 frame_tree_node_->navigator()->DidStartProvisionalLoad( 410 frame_tree_node_->navigator()->DidStartProvisionalLoad(
409 this, parent_routing_id, url); 411 this, parent_routing_id, url, is_transition_navigation);
410 } 412 }
411 413
412 void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError( 414 void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError(
413 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) { 415 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) {
414 frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params); 416 frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params);
415 } 417 }
416 418
417 void RenderFrameHostImpl::OnDidFailLoadWithError( 419 void RenderFrameHostImpl::OnDidFailLoadWithError(
418 const GURL& url, 420 const GURL& url,
419 int error_code, 421 int error_code,
(...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after
944 FROM_HERE, 946 FROM_HERE,
945 base::Bind( 947 base::Bind(
946 &TransitionRequestManager::SetHasPendingTransitionRequest, 948 &TransitionRequestManager::SetHasPendingTransitionRequest,
947 base::Unretained(TransitionRequestManager::GetInstance()), 949 base::Unretained(TransitionRequestManager::GetInstance()),
948 GetProcess()->GetID(), 950 GetProcess()->GetID(),
949 routing_id_, 951 routing_id_,
950 has_pending_request)); 952 has_pending_request));
951 } 953 }
952 954
953 } // namespace content 955 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698