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

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

Issue 429413003: Revert of Cache the current WebPreferences on RenderViewHostImpl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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
« no previous file with comments | « content/test/test_web_contents.h ('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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 params.was_within_same_page = false; 84 params.was_within_same_page = false;
85 params.is_post = false; 85 params.is_post = false;
86 params.page_state = PageState::CreateFromURL(url); 86 params.page_state = PageState::CreateFromURL(url);
87 87
88 RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(render_view_host); 88 RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(render_view_host);
89 RenderFrameHostImpl* rfh = RenderFrameHostImpl::FromID( 89 RenderFrameHostImpl* rfh = RenderFrameHostImpl::FromID(
90 rvh->GetProcess()->GetID(), rvh->main_frame_routing_id()); 90 rvh->GetProcess()->GetID(), rvh->main_frame_routing_id());
91 frame_tree_.root()->navigator()->DidNavigate(rfh, params); 91 frame_tree_.root()->navigator()->DidNavigate(rfh, params);
92 } 92 }
93 93
94 WebPreferences TestWebContents::TestComputeWebkitPrefs() { 94 WebPreferences TestWebContents::TestGetWebkitPrefs() {
95 return ComputeWebkitPrefs(); 95 return GetWebkitPrefs();
96 } 96 }
97 97
98 bool TestWebContents::CreateRenderViewForRenderManager( 98 bool TestWebContents::CreateRenderViewForRenderManager(
99 RenderViewHost* render_view_host, 99 RenderViewHost* render_view_host,
100 int opener_route_id, 100 int opener_route_id,
101 int proxy_routing_id, 101 int proxy_routing_id,
102 bool for_main_frame) { 102 bool for_main_frame) {
103 UpdateMaxPageIDIfNecessary(render_view_host); 103 UpdateMaxPageIDIfNecessary(render_view_host);
104 // This will go to a TestRenderViewHost. 104 // This will go to a TestRenderViewHost.
105 static_cast<RenderViewHostImpl*>( 105 static_cast<RenderViewHostImpl*>(
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 } 247 }
248 248
249 void TestWebContents::ShowCreatedWidget(int route_id, 249 void TestWebContents::ShowCreatedWidget(int route_id,
250 const gfx::Rect& initial_pos) { 250 const gfx::Rect& initial_pos) {
251 } 251 }
252 252
253 void TestWebContents::ShowCreatedFullscreenWidget(int route_id) { 253 void TestWebContents::ShowCreatedFullscreenWidget(int route_id) {
254 } 254 }
255 255
256 } // namespace content 256 } // namespace content
OLDNEW
« no previous file with comments | « content/test/test_web_contents.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698