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

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

Issue 187843005: Remove stale frame ID references for RequestTransferURL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove incorrect check. Created 6 years, 9 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/containers/hash_tables.h" 7 #include "base/containers/hash_tables.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/metrics/user_metrics_action.h" 9 #include "base/metrics/user_metrics_action.h"
10 #include "content/browser/child_process_security_policy_impl.h" 10 #include "content/browser/child_process_security_policy_impl.h"
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 void RenderFrameHostImpl::OnDetach() { 193 void RenderFrameHostImpl::OnDetach() {
194 frame_tree_->RemoveFrame(frame_tree_node_); 194 frame_tree_->RemoveFrame(frame_tree_node_);
195 } 195 }
196 196
197 void RenderFrameHostImpl::OnOpenURL( 197 void RenderFrameHostImpl::OnOpenURL(
198 const FrameHostMsg_OpenURL_Params& params) { 198 const FrameHostMsg_OpenURL_Params& params) {
199 GURL validated_url(params.url); 199 GURL validated_url(params.url);
200 GetProcess()->FilterURL(false, &validated_url); 200 GetProcess()->FilterURL(false, &validated_url);
201 201
202 frame_tree_node_->navigator()->RequestOpenURL( 202 frame_tree_node_->navigator()->RequestOpenURL(
203 this, validated_url, params.referrer, params.disposition, params.frame_id, 203 this, validated_url, params.referrer, params.disposition,
204 params.should_replace_current_entry, params.user_gesture); 204 params.should_replace_current_entry, params.user_gesture);
205 } 205 }
206 206
207 void RenderFrameHostImpl::OnDidStartProvisionalLoadForFrame( 207 void RenderFrameHostImpl::OnDidStartProvisionalLoadForFrame(
208 int parent_routing_id, 208 int parent_routing_id,
209 bool is_main_frame, 209 bool is_main_frame,
210 const GURL& url) { 210 const GURL& url) {
211 frame_tree_node_->navigator()->DidStartProvisionalLoad( 211 frame_tree_node_->navigator()->DidStartProvisionalLoad(
212 this, parent_routing_id, is_main_frame, url); 212 this, parent_routing_id, is_main_frame, url);
213 } 213 }
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 params.pending_history_list_offset = -1; 448 params.pending_history_list_offset = -1;
449 params.current_history_list_offset = -1; 449 params.current_history_list_offset = -1;
450 params.current_history_list_length = 0; 450 params.current_history_list_length = 0;
451 params.url = url; 451 params.url = url;
452 params.transition = PAGE_TRANSITION_LINK; 452 params.transition = PAGE_TRANSITION_LINK;
453 params.navigation_type = FrameMsg_Navigate_Type::NORMAL; 453 params.navigation_type = FrameMsg_Navigate_Type::NORMAL;
454 Navigate(params); 454 Navigate(params);
455 } 455 }
456 456
457 } // namespace content 457 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698