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

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

Issue 1064413003: PlzNavigate: make RenderViewtest helper functions work (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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 1046 matching lines...) Expand 10 before | Expand all | Expand 10 after
1057 #endif 1057 #endif
1058 IPC_END_MESSAGE_MAP() 1058 IPC_END_MESSAGE_MAP()
1059 1059
1060 return handled; 1060 return handled;
1061 } 1061 }
1062 1062
1063 void RenderFrameImpl::OnNavigate( 1063 void RenderFrameImpl::OnNavigate(
1064 const CommonNavigationParams& common_params, 1064 const CommonNavigationParams& common_params,
1065 const StartNavigationParams& start_params, 1065 const StartNavigationParams& start_params,
1066 const RequestNavigationParams& request_params) { 1066 const RequestNavigationParams& request_params) {
1067 CHECK(!base::CommandLine::ForCurrentProcess()->HasSwitch(
clamy 2015/04/08 14:19:30 I added the CHECK to catch tests that manually cal
carlosk 2015/04/08 15:16:42 Good idea! Will make it way easier to find those m
Charlie Reis 2015/04/09 00:47:40 Sounds good. Can you make this a DCHECK instead?
clamy 2015/04/09 15:55:06 Done.
1068 switches::kEnableBrowserSideNavigation));
1067 TRACE_EVENT2("navigation", "RenderFrameImpl::OnNavigate", "id", routing_id_, 1069 TRACE_EVENT2("navigation", "RenderFrameImpl::OnNavigate", "id", routing_id_,
1068 "url", common_params.url.possibly_invalid_spec()); 1070 "url", common_params.url.possibly_invalid_spec());
1069 1071
1070 bool is_reload = IsReload(common_params.navigation_type); 1072 bool is_reload = IsReload(common_params.navigation_type);
1071 bool is_history_navigation = request_params.page_state.IsValid(); 1073 bool is_history_navigation = request_params.page_state.IsValid();
1072 WebURLRequest::CachePolicy cache_policy = 1074 WebURLRequest::CachePolicy cache_policy =
1073 WebURLRequest::UseProtocolCachePolicy; 1075 WebURLRequest::UseProtocolCachePolicy;
1074 if (!RenderFrameImpl::PrepareRenderViewForNavigation( 1076 if (!RenderFrameImpl::PrepareRenderViewForNavigation(
1075 common_params.url, is_history_navigation, request_params, &is_reload, 1077 common_params.url, is_history_navigation, request_params, &is_reload,
1076 &cache_policy)) { 1078 &cache_policy)) {
(...skipping 3619 matching lines...) Expand 10 before | Expand all | Expand 10 after
4696 #elif defined(ENABLE_BROWSER_CDMS) 4698 #elif defined(ENABLE_BROWSER_CDMS)
4697 cdm_manager_, 4699 cdm_manager_,
4698 #endif 4700 #endif
4699 this); 4701 this);
4700 } 4702 }
4701 4703
4702 return cdm_factory_; 4704 return cdm_factory_;
4703 } 4705 }
4704 4706
4705 } // namespace content 4707 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698