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_render_view_host.h" | 5 #include "content/test/test_render_view_host.h" |
6 | 6 |
7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
8 #include "content/browser/dom_storage/dom_storage_context_wrapper.h" | 8 #include "content/browser/dom_storage/dom_storage_context_wrapper.h" |
9 #include "content/browser/dom_storage/session_storage_namespace_impl.h" | 9 #include "content/browser/dom_storage/session_storage_namespace_impl.h" |
10 #include "content/browser/site_instance_impl.h" | 10 #include "content/browser/site_instance_impl.h" |
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
237 } | 237 } |
238 | 238 |
239 TestRenderViewHost::~TestRenderViewHost() { | 239 TestRenderViewHost::~TestRenderViewHost() { |
240 if (delete_counter_) | 240 if (delete_counter_) |
241 ++*delete_counter_; | 241 ++*delete_counter_; |
242 } | 242 } |
243 | 243 |
244 bool TestRenderViewHost::CreateRenderView( | 244 bool TestRenderViewHost::CreateRenderView( |
245 const base::string16& frame_name, | 245 const base::string16& frame_name, |
246 int opener_route_id, | 246 int opener_route_id, |
247 int32 max_page_id) { | 247 int32 max_page_id, |
| 248 bool window_was_created_with_opener) { |
248 DCHECK(!render_view_created_); | 249 DCHECK(!render_view_created_); |
249 render_view_created_ = true; | 250 render_view_created_ = true; |
250 opener_route_id_ = opener_route_id; | 251 opener_route_id_ = opener_route_id; |
251 return true; | 252 return true; |
252 } | 253 } |
253 | 254 |
254 bool TestRenderViewHost::IsRenderViewLive() const { | 255 bool TestRenderViewHost::IsRenderViewLive() const { |
255 return render_view_created_; | 256 return render_view_created_; |
256 } | 257 } |
257 | 258 |
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
390 | 391 |
391 TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() { | 392 TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() { |
392 return static_cast<TestRenderFrameHost*>(main_rfh()); | 393 return static_cast<TestRenderFrameHost*>(main_rfh()); |
393 } | 394 } |
394 | 395 |
395 TestWebContents* RenderViewHostImplTestHarness::contents() { | 396 TestWebContents* RenderViewHostImplTestHarness::contents() { |
396 return static_cast<TestWebContents*>(web_contents()); | 397 return static_cast<TestWebContents*>(web_contents()); |
397 } | 398 } |
398 | 399 |
399 } // namespace content | 400 } // namespace content |
OLD | NEW |