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 #ifndef CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ | 5 #ifndef CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ |
6 #define CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ | 6 #define CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 22 matching lines...) Expand all Loading... |
33 namespace gfx { | 33 namespace gfx { |
34 class Rect; | 34 class Rect; |
35 } | 35 } |
36 | 36 |
37 namespace content { | 37 namespace content { |
38 | 38 |
39 class SiteInstance; | 39 class SiteInstance; |
40 class TestRenderFrameHost; | 40 class TestRenderFrameHost; |
41 class TestWebContents; | 41 class TestWebContents; |
42 | 42 |
43 // Utility function to initialize ViewHostMsg_NavigateParams_Params | 43 // Utility function to initialize FrameHostMsg_DidCommitProvisionalLoad_Params |
44 // with given |page_id|, |url| and |transition_type|. | 44 // with given parameters. |
45 void InitNavigateParams(FrameHostMsg_DidCommitProvisionalLoad_Params* params, | 45 void InitNavigateParams(FrameHostMsg_DidCommitProvisionalLoad_Params* params, |
46 int page_id, | 46 int page_id, |
| 47 int nav_entry_id, |
| 48 bool did_create_new_entry, |
47 const GURL& url, | 49 const GURL& url, |
48 ui::PageTransition transition_type); | 50 ui::PageTransition transition_type); |
49 | 51 |
50 // TestRenderViewHostView ------------------------------------------------------ | 52 // TestRenderViewHostView ------------------------------------------------------ |
51 | 53 |
52 // Subclass the RenderViewHost's view so that we can call Show(), etc., | 54 // Subclass the RenderViewHost's view so that we can call Show(), etc., |
53 // without having side-effects. | 55 // without having side-effects. |
54 class TestRenderWidgetHostView : public RenderWidgetHostViewBase { | 56 class TestRenderWidgetHostView : public RenderWidgetHostViewBase { |
55 public: | 57 public: |
56 explicit TestRenderWidgetHostView(RenderWidgetHost* rwh); | 58 explicit TestRenderWidgetHostView(RenderWidgetHost* rwh); |
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
314 private: | 316 private: |
315 typedef scoped_ptr<ui::test::ScopedSetSupportedScaleFactors> | 317 typedef scoped_ptr<ui::test::ScopedSetSupportedScaleFactors> |
316 ScopedSetSupportedScaleFactors; | 318 ScopedSetSupportedScaleFactors; |
317 ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_; | 319 ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_; |
318 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness); | 320 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness); |
319 }; | 321 }; |
320 | 322 |
321 } // namespace content | 323 } // namespace content |
322 | 324 |
323 #endif // CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ | 325 #endif // CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ |
OLD | NEW |