Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(209)

Side by Side Diff: content/test/test_render_view_host.h

Issue 556703004: Remove page id from FrameNavigateParams. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/test/test_render_frame_host.cc ('k') | content/test/test_render_view_host.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 21 matching lines...) Expand all
32 class Rect; 32 class Rect;
33 } 33 }
34 34
35 namespace content { 35 namespace content {
36 36
37 class SiteInstance; 37 class SiteInstance;
38 class TestRenderFrameHost; 38 class TestRenderFrameHost;
39 class TestWebContents; 39 class TestWebContents;
40 40
41 // Utility function to initialize ViewHostMsg_NavigateParams_Params 41 // Utility function to initialize ViewHostMsg_NavigateParams_Params
42 // with given |page_id|, |url| and |transition_type|. 42 // with given |url| and |transition_type|.
43 void InitNavigateParams(FrameHostMsg_DidCommitProvisionalLoad_Params* params, 43 void InitNavigateParams(FrameHostMsg_DidCommitProvisionalLoad_Params* params,
44 int page_id,
45 const GURL& url, 44 const GURL& url,
46 ui::PageTransition transition_type); 45 ui::PageTransition transition_type);
47 46
48 // TestRenderViewHostView ------------------------------------------------------ 47 // TestRenderViewHostView ------------------------------------------------------
49 48
50 // Subclass the RenderViewHost's view so that we can call Show(), etc., 49 // Subclass the RenderViewHost's view so that we can call Show(), etc.,
51 // without having side-effects. 50 // without having side-effects.
52 class TestRenderWidgetHostView : public RenderWidgetHostViewBase { 51 class TestRenderWidgetHostView : public RenderWidgetHostViewBase {
53 public: 52 public:
54 explicit TestRenderWidgetHostView(RenderWidgetHost* rwh); 53 explicit TestRenderWidgetHostView(RenderWidgetHost* rwh);
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 private: 318 private:
320 typedef scoped_ptr<ui::test::ScopedSetSupportedScaleFactors> 319 typedef scoped_ptr<ui::test::ScopedSetSupportedScaleFactors>
321 ScopedSetSupportedScaleFactors; 320 ScopedSetSupportedScaleFactors;
322 ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_; 321 ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_;
323 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness); 322 DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness);
324 }; 323 };
325 324
326 } // namespace content 325 } // namespace content
327 326
328 #endif // CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_ 327 #endif // CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_
OLDNEW
« no previous file with comments | « content/test/test_render_frame_host.cc ('k') | content/test/test_render_view_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698