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

Side by Side Diff: content/test/test_web_contents.cc

Issue 556703004: Remove page id from FrameNavigateParams. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes Created 6 years, 1 month 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 | « content/test/test_render_view_host.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/test/test_web_contents.h" 5 #include "content/test/test_web_contents.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "content/browser/browser_url_handler_impl.h" 9 #include "content/browser/browser_url_handler_impl.h"
10 #include "content/browser/frame_host/cross_process_frame_connector.h" 10 #include "content/browser/frame_host/cross_process_frame_connector.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 } 70 }
71 71
72 void TestWebContents::TestDidNavigateWithReferrer( 72 void TestWebContents::TestDidNavigateWithReferrer(
73 RenderFrameHost* render_frame_host, 73 RenderFrameHost* render_frame_host,
74 int page_id, 74 int page_id,
75 const GURL& url, 75 const GURL& url,
76 const Referrer& referrer, 76 const Referrer& referrer,
77 ui::PageTransition transition) { 77 ui::PageTransition transition) {
78 FrameHostMsg_DidCommitProvisionalLoad_Params params; 78 FrameHostMsg_DidCommitProvisionalLoad_Params params;
79 79
80 params.page_id = page_id;
81 params.url = url; 80 params.url = url;
82 params.referrer = referrer; 81 params.referrer = referrer;
83 params.transition = transition; 82 params.transition = transition;
84 params.redirects = std::vector<GURL>(); 83 params.redirects = std::vector<GURL>();
85 params.should_update_history = false; 84 params.should_update_history = false;
86 params.searchable_form_url = GURL(); 85 params.searchable_form_url = GURL();
87 params.searchable_form_encoding = std::string(); 86 params.searchable_form_encoding = std::string();
88 params.security_info = std::string(); 87 params.security_info = std::string();
89 params.gesture = NavigationGestureUser; 88 params.gesture = NavigationGestureUser;
90 params.was_within_same_page = false; 89 params.was_within_same_page = false;
91 params.is_post = false; 90 params.is_post = false;
92 params.page_state = PageState::CreateFromURL(url); 91 params.page_state = PageState::CreateFromURL(url);
93 92
94 RenderFrameHostImpl* rfhi = 93 RenderFrameHostImpl* rfhi =
95 static_cast<RenderFrameHostImpl*>(render_frame_host); 94 static_cast<RenderFrameHostImpl*>(render_frame_host);
96 rfhi->frame_tree_node()->navigator()->DidNavigate(rfhi, params); 95 rfhi->frame_tree_node()->navigator()->DidNavigate(rfhi, page_id, params);
97 } 96 }
98 97
99 WebPreferences TestWebContents::TestComputeWebkitPrefs() { 98 WebPreferences TestWebContents::TestComputeWebkitPrefs() {
100 return ComputeWebkitPrefs(); 99 return ComputeWebkitPrefs();
101 } 100 }
102 101
103 bool TestWebContents::CreateRenderViewForRenderManager( 102 bool TestWebContents::CreateRenderViewForRenderManager(
104 RenderViewHost* render_view_host, 103 RenderViewHost* render_view_host,
105 int opener_route_id, 104 int opener_route_id,
106 int proxy_routing_id, 105 int proxy_routing_id,
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 } 249 }
251 250
252 void TestWebContents::ShowCreatedWidget(int route_id, 251 void TestWebContents::ShowCreatedWidget(int route_id,
253 const gfx::Rect& initial_pos) { 252 const gfx::Rect& initial_pos) {
254 } 253 }
255 254
256 void TestWebContents::ShowCreatedFullscreenWidget(int route_id) { 255 void TestWebContents::ShowCreatedFullscreenWidget(int route_id) {
257 } 256 }
258 257
259 } // namespace content 258 } // namespace content
OLDNEW
« no previous file with comments | « content/test/test_render_view_host.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698