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

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

Issue 1013203002: PlzNavigate: Update the pending navigation params in RenderViewImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « no previous file | content/renderer/render_view_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 3938 matching lines...) Expand 10 before | Expand all | Expand 10 after
3949 WebURLRequest::CachePolicy cache_policy = 3949 WebURLRequest::CachePolicy cache_policy =
3950 WebURLRequest::UseProtocolCachePolicy; 3950 WebURLRequest::UseProtocolCachePolicy;
3951 if (!RenderFrameImpl::PrepareRenderViewForNavigation( 3951 if (!RenderFrameImpl::PrepareRenderViewForNavigation(
3952 common_params.url, is_history_navigation, history_params, &is_reload, 3952 common_params.url, is_history_navigation, history_params, &is_reload,
3953 &cache_policy)) { 3953 &cache_policy)) {
3954 return; 3954 return;
3955 } 3955 }
3956 3956
3957 GetContentClient()->SetActiveURL(common_params.url); 3957 GetContentClient()->SetActiveURL(common_params.url);
3958 3958
3959 // TODO(clamy): reset the pending navigation parameters in RenderView. 3959 render_view_->pending_navigation_params_.reset(new NavigationParams(
3960 common_params, StartNavigationParams(), commit_params, history_params));
3960 3961
3961 if (!common_params.base_url_for_data_url.is_empty() || 3962 if (!common_params.base_url_for_data_url.is_empty() ||
3962 common_params.url.SchemeIs(url::kDataScheme)) { 3963 common_params.url.SchemeIs(url::kDataScheme)) {
3963 LoadDataURL(common_params, frame_); 3964 LoadDataURL(common_params, frame_);
3964 return; 3965 return;
3965 } 3966 }
3966 3967
3967 // Create a WebURLRequest that blink can use to get access to the body of the 3968 // Create a WebURLRequest that blink can use to get access to the body of the
3968 // response through a stream in the browser. Blink will then commit the 3969 // response through a stream in the browser. Blink will then commit the
3969 // navigation. 3970 // navigation.
(...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after
4550 4551
4551 #if defined(ENABLE_BROWSER_CDMS) 4552 #if defined(ENABLE_BROWSER_CDMS)
4552 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 4553 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
4553 if (!cdm_manager_) 4554 if (!cdm_manager_)
4554 cdm_manager_ = new RendererCdmManager(this); 4555 cdm_manager_ = new RendererCdmManager(this);
4555 return cdm_manager_; 4556 return cdm_manager_;
4556 } 4557 }
4557 #endif // defined(ENABLE_BROWSER_CDMS) 4558 #endif // defined(ENABLE_BROWSER_CDMS)
4558 4559
4559 } // namespace content 4560 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/renderer/render_view_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698