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

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

Issue 556703004: Remove page id from FrameNavigateParams. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cleaner Created 6 years, 3 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
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/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 3251 matching lines...) Expand 10 before | Expand all | Expand 10 after
3262 3262
3263 DocumentState* document_state = DocumentState::FromDataSource(ds); 3263 DocumentState* document_state = DocumentState::FromDataSource(ds);
3264 NavigationState* navigation_state = document_state->navigation_state(); 3264 NavigationState* navigation_state = document_state->navigation_state();
3265 InternalDocumentStateData* internal_data = 3265 InternalDocumentStateData* internal_data =
3266 InternalDocumentStateData::FromDocumentState(document_state); 3266 InternalDocumentStateData::FromDocumentState(document_state);
3267 3267
3268 FrameHostMsg_DidCommitProvisionalLoad_Params params; 3268 FrameHostMsg_DidCommitProvisionalLoad_Params params;
3269 params.http_status_code = response.httpStatusCode(); 3269 params.http_status_code = response.httpStatusCode();
3270 params.is_post = false; 3270 params.is_post = false;
3271 params.post_id = -1; 3271 params.post_id = -1;
3272 params.page_id = render_view_->page_id_;
3273 // We need to track the RenderViewHost routing_id because of downstream 3272 // We need to track the RenderViewHost routing_id because of downstream
3274 // dependencies (crbug.com/392171 DownloadRequestHandle, SaveFileManager, 3273 // dependencies (crbug.com/392171 DownloadRequestHandle, SaveFileManager,
3275 // ResourceDispatcherHostImpl, MediaStreamUIProxy, 3274 // ResourceDispatcherHostImpl, MediaStreamUIProxy,
3276 // SpeechRecognitionDispatcherHost and possibly others). They look up the view 3275 // SpeechRecognitionDispatcherHost and possibly others). They look up the view
3277 // based on the ID stored in the resource requests. Once those dependencies 3276 // based on the ID stored in the resource requests. Once those dependencies
3278 // are unwound or moved to RenderFrameHost (crbug.com/304341) we can move the 3277 // are unwound or moved to RenderFrameHost (crbug.com/304341) we can move the
3279 // client to be based on the routing_id of the RenderFrameHost. 3278 // client to be based on the routing_id of the RenderFrameHost.
3280 params.render_view_routing_id = render_view_->routing_id(); 3279 params.render_view_routing_id = render_view_->routing_id();
3281 params.socket_address.set_host(response.remoteIPAddress().utf8()); 3280 params.socket_address.set_host(response.remoteIPAddress().utf8());
3282 params.socket_address.set_port(response.remotePort()); 3281 params.socket_address.set_port(response.remotePort());
(...skipping 616 matching lines...) Expand 10 before | Expand all | Expand 10 after
3899 3898
3900 #if defined(ENABLE_BROWSER_CDMS) 3899 #if defined(ENABLE_BROWSER_CDMS)
3901 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 3900 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
3902 if (!cdm_manager_) 3901 if (!cdm_manager_)
3903 cdm_manager_ = new RendererCdmManager(this); 3902 cdm_manager_ = new RendererCdmManager(this);
3904 return cdm_manager_; 3903 return cdm_manager_;
3905 } 3904 }
3906 #endif // defined(ENABLE_BROWSER_CDMS) 3905 #endif // defined(ENABLE_BROWSER_CDMS)
3907 3906
3908 } // namespace content 3907 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698