OLD | NEW |
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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
92 frame_tree_.root()->navigator()->DidNavigate(rfh, params); | 92 frame_tree_.root()->navigator()->DidNavigate(rfh, params); |
93 } | 93 } |
94 | 94 |
95 WebPreferences TestWebContents::TestGetWebkitPrefs() { | 95 WebPreferences TestWebContents::TestGetWebkitPrefs() { |
96 return GetWebkitPrefs(); | 96 return GetWebkitPrefs(); |
97 } | 97 } |
98 | 98 |
99 bool TestWebContents::CreateRenderViewForRenderManager( | 99 bool TestWebContents::CreateRenderViewForRenderManager( |
100 RenderViewHost* render_view_host, | 100 RenderViewHost* render_view_host, |
101 int opener_route_id, | 101 int opener_route_id, |
| 102 int proxy_routing_id, |
102 CrossProcessFrameConnector* frame_connector) { | 103 CrossProcessFrameConnector* frame_connector) { |
103 UpdateMaxPageIDIfNecessary(render_view_host); | 104 UpdateMaxPageIDIfNecessary(render_view_host); |
104 // This will go to a TestRenderViewHost. | 105 // This will go to a TestRenderViewHost. |
105 static_cast<RenderViewHostImpl*>( | 106 static_cast<RenderViewHostImpl*>( |
106 render_view_host)->CreateRenderView(base::string16(), | 107 render_view_host)->CreateRenderView(base::string16(), |
107 opener_route_id, | 108 opener_route_id, |
| 109 proxy_routing_id, |
108 -1, false); | 110 -1, false); |
109 return true; | 111 return true; |
110 } | 112 } |
111 | 113 |
112 WebContents* TestWebContents::Clone() { | 114 WebContents* TestWebContents::Clone() { |
113 WebContentsImpl* contents = | 115 WebContentsImpl* contents = |
114 Create(GetBrowserContext(), SiteInstance::Create(GetBrowserContext())); | 116 Create(GetBrowserContext(), SiteInstance::Create(GetBrowserContext())); |
115 contents->GetController().CopyStateFrom(controller_); | 117 contents->GetController().CopyStateFrom(controller_); |
116 return contents; | 118 return contents; |
117 } | 119 } |
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
246 } | 248 } |
247 | 249 |
248 void TestWebContents::ShowCreatedWidget(int route_id, | 250 void TestWebContents::ShowCreatedWidget(int route_id, |
249 const gfx::Rect& initial_pos) { | 251 const gfx::Rect& initial_pos) { |
250 } | 252 } |
251 | 253 |
252 void TestWebContents::ShowCreatedFullscreenWidget(int route_id) { | 254 void TestWebContents::ShowCreatedFullscreenWidget(int route_id) { |
253 } | 255 } |
254 | 256 |
255 } // namespace content | 257 } // namespace content |
OLD | NEW |