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/loader/resource_dispatcher_host_impl.h" | 10 #include "content/browser/loader/resource_dispatcher_host_impl.h" |
(...skipping 10 matching lines...) Expand all Loading... |
21 #include "content/public/common/web_preferences.h" | 21 #include "content/public/common/web_preferences.h" |
22 #include "content/test/test_render_frame_host.h" | 22 #include "content/test/test_render_frame_host.h" |
23 #include "content/test/test_web_contents.h" | 23 #include "content/test/test_web_contents.h" |
24 #include "media/base/video_frame.h" | 24 #include "media/base/video_frame.h" |
25 #include "ui/gfx/geometry/rect.h" | 25 #include "ui/gfx/geometry/rect.h" |
26 | 26 |
27 namespace content { | 27 namespace content { |
28 | 28 |
29 void InitNavigateParams(FrameHostMsg_DidCommitProvisionalLoad_Params* params, | 29 void InitNavigateParams(FrameHostMsg_DidCommitProvisionalLoad_Params* params, |
30 int page_id, | 30 int page_id, |
| 31 int nav_entry_id, |
| 32 bool did_create_new_entry, |
31 const GURL& url, | 33 const GURL& url, |
32 ui::PageTransition transition) { | 34 ui::PageTransition transition) { |
33 params->page_id = page_id; | 35 params->page_id = page_id; |
| 36 params->nav_entry_id = nav_entry_id; |
34 params->url = url; | 37 params->url = url; |
35 params->referrer = Referrer(); | 38 params->referrer = Referrer(); |
36 params->transition = transition; | 39 params->transition = transition; |
37 params->redirects = std::vector<GURL>(); | 40 params->redirects = std::vector<GURL>(); |
38 params->should_update_history = false; | 41 params->should_update_history = false; |
39 params->searchable_form_url = GURL(); | 42 params->searchable_form_url = GURL(); |
40 params->searchable_form_encoding = std::string(); | 43 params->searchable_form_encoding = std::string(); |
| 44 params->did_create_new_entry = did_create_new_entry; |
41 params->security_info = std::string(); | 45 params->security_info = std::string(); |
42 params->gesture = NavigationGestureUser; | 46 params->gesture = NavigationGestureUser; |
43 params->was_within_same_page = false; | 47 params->was_within_same_page = false; |
44 params->is_post = false; | 48 params->is_post = false; |
45 params->page_state = PageState::CreateFromURL(url); | 49 params->page_state = PageState::CreateFromURL(url); |
46 } | 50 } |
47 | 51 |
48 TestRenderWidgetHostView::TestRenderWidgetHostView(RenderWidgetHost* rwh) | 52 TestRenderWidgetHostView::TestRenderWidgetHostView(RenderWidgetHost* rwh) |
49 : rwh_(RenderWidgetHostImpl::From(rwh)), | 53 : rwh_(RenderWidgetHostImpl::From(rwh)), |
50 is_showing_(false), | 54 is_showing_(false), |
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
309 | 313 |
310 TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() { | 314 TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() { |
311 return contents()->GetMainFrame(); | 315 return contents()->GetMainFrame(); |
312 } | 316 } |
313 | 317 |
314 TestWebContents* RenderViewHostImplTestHarness::contents() { | 318 TestWebContents* RenderViewHostImplTestHarness::contents() { |
315 return static_cast<TestWebContents*>(web_contents()); | 319 return static_cast<TestWebContents*>(web_contents()); |
316 } | 320 } |
317 | 321 |
318 } // namespace content | 322 } // namespace content |
OLD | NEW |