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/browser/renderer_host/test_render_view_host.h" | 5 #include "content/browser/renderer_host/test_render_view_host.h" |
6 | 6 |
7 #include "content/browser/dom_storage/dom_storage_context_impl.h" | 7 #include "content/browser/dom_storage/dom_storage_context_impl.h" |
8 #include "content/browser/dom_storage/session_storage_namespace_impl.h" | 8 #include "content/browser/dom_storage/session_storage_namespace_impl.h" |
9 #include "content/browser/renderer_host/test_backing_store.h" | 9 #include "content/browser/renderer_host/test_backing_store.h" |
10 #include "content/browser/site_instance_impl.h" | 10 #include "content/browser/site_instance_impl.h" |
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
233 void TestRenderWidgetHostView::SetParentNativeViewAccessible( | 233 void TestRenderWidgetHostView::SetParentNativeViewAccessible( |
234 gfx::NativeViewAccessible accessible_parent) { | 234 gfx::NativeViewAccessible accessible_parent) { |
235 } | 235 } |
236 #endif | 236 #endif |
237 | 237 |
238 TestRenderViewHost::TestRenderViewHost( | 238 TestRenderViewHost::TestRenderViewHost( |
239 SiteInstance* instance, | 239 SiteInstance* instance, |
240 RenderViewHostDelegate* delegate, | 240 RenderViewHostDelegate* delegate, |
241 RenderWidgetHostDelegate* widget_delegate, | 241 RenderWidgetHostDelegate* widget_delegate, |
242 int routing_id, | 242 int routing_id, |
| 243 int main_frame_routing_id, |
243 bool swapped_out) | 244 bool swapped_out) |
244 : RenderViewHostImpl(instance, | 245 : RenderViewHostImpl(instance, |
245 delegate, | 246 delegate, |
246 widget_delegate, | 247 widget_delegate, |
247 routing_id, | 248 routing_id, |
| 249 main_frame_routing_id, |
248 swapped_out, | 250 swapped_out, |
249 CreateSessionStorageNamespace(instance)), | 251 CreateSessionStorageNamespace(instance)), |
250 render_view_created_(false), | 252 render_view_created_(false), |
251 delete_counter_(NULL), | 253 delete_counter_(NULL), |
252 simulate_fetch_via_proxy_(false), | 254 simulate_fetch_via_proxy_(false), |
253 simulate_history_list_was_cleared_(false), | 255 simulate_history_list_was_cleared_(false), |
254 contents_mime_type_("text/html") { | 256 contents_mime_type_("text/html") { |
255 // For normal RenderViewHosts, this is freed when |Shutdown()| is | 257 // For normal RenderViewHosts, this is freed when |Shutdown()| is |
256 // called. For TestRenderViewHost, the view is explicitly | 258 // called. For TestRenderViewHost, the view is explicitly |
257 // deleted in the destructor below, because | 259 // deleted in the destructor below, because |
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
416 | 418 |
417 TestRenderViewHost* RenderViewHostImplTestHarness::active_test_rvh() { | 419 TestRenderViewHost* RenderViewHostImplTestHarness::active_test_rvh() { |
418 return static_cast<TestRenderViewHost*>(active_rvh()); | 420 return static_cast<TestRenderViewHost*>(active_rvh()); |
419 } | 421 } |
420 | 422 |
421 TestWebContents* RenderViewHostImplTestHarness::contents() { | 423 TestWebContents* RenderViewHostImplTestHarness::contents() { |
422 return static_cast<TestWebContents*>(web_contents()); | 424 return static_cast<TestWebContents*>(web_contents()); |
423 } | 425 } |
424 | 426 |
425 } // namespace content | 427 } // namespace content |
OLD | NEW |