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