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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 182713005: Remove frame ID from DidCommitProvisionalLoad. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix John's comments and signin test 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/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 2101 matching lines...) Expand 10 before | Expand all | Expand 10 after
2112 DocumentState* document_state = DocumentState::FromDataSource(ds); 2112 DocumentState* document_state = DocumentState::FromDataSource(ds);
2113 NavigationState* navigation_state = document_state->navigation_state(); 2113 NavigationState* navigation_state = document_state->navigation_state();
2114 InternalDocumentStateData* internal_data = 2114 InternalDocumentStateData* internal_data =
2115 InternalDocumentStateData::FromDocumentState(document_state); 2115 InternalDocumentStateData::FromDocumentState(document_state);
2116 2116
2117 FrameHostMsg_DidCommitProvisionalLoad_Params params; 2117 FrameHostMsg_DidCommitProvisionalLoad_Params params;
2118 params.http_status_code = response.httpStatusCode(); 2118 params.http_status_code = response.httpStatusCode();
2119 params.is_post = false; 2119 params.is_post = false;
2120 params.post_id = -1; 2120 params.post_id = -1;
2121 params.page_id = render_view_->page_id_; 2121 params.page_id = render_view_->page_id_;
2122 params.frame_id = routing_id_;
2123 params.frame_unique_name = frame->uniqueName(); 2122 params.frame_unique_name = frame->uniqueName();
2124 params.socket_address.set_host(response.remoteIPAddress().utf8()); 2123 params.socket_address.set_host(response.remoteIPAddress().utf8());
2125 params.socket_address.set_port(response.remotePort()); 2124 params.socket_address.set_port(response.remotePort());
2126 WebURLResponseExtraDataImpl* extra_data = GetExtraDataFromResponse(response); 2125 WebURLResponseExtraDataImpl* extra_data = GetExtraDataFromResponse(response);
2127 if (extra_data) 2126 if (extra_data)
2128 params.was_fetched_via_proxy = extra_data->was_fetched_via_proxy(); 2127 params.was_fetched_via_proxy = extra_data->was_fetched_via_proxy();
2129 params.was_within_same_page = navigation_state->was_within_same_page(); 2128 params.was_within_same_page = navigation_state->was_within_same_page();
2130 params.security_info = response.securityInfo(); 2129 params.security_info = response.securityInfo();
2131 2130
2132 // Set the URL to be displayed in the browser UI to the user. 2131 // Set the URL to be displayed in the browser UI to the user.
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
2275 2274
2276 void RenderFrameImpl::didStartLoading() { 2275 void RenderFrameImpl::didStartLoading() {
2277 Send(new FrameHostMsg_DidStartLoading(routing_id_)); 2276 Send(new FrameHostMsg_DidStartLoading(routing_id_));
2278 } 2277 }
2279 2278
2280 void RenderFrameImpl::didStopLoading() { 2279 void RenderFrameImpl::didStopLoading() {
2281 Send(new FrameHostMsg_DidStopLoading(routing_id_)); 2280 Send(new FrameHostMsg_DidStopLoading(routing_id_));
2282 } 2281 }
2283 2282
2284 } // namespace content 2283 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698