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

Side by Side Diff: trunk/src/content/test/test_web_contents.h

Issue 295833002: Revert 271461 "Decouple RVH creation from CrossProcessFrameConne..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 months 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 | Annotate | Revision Log
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_WEB_CONTENTS_H_ 5 #ifndef CONTENT_TEST_TEST_WEB_CONTENTS_H_
6 #define CONTENT_TEST_TEST_WEB_CONTENTS_H_ 6 #define CONTENT_TEST_TEST_WEB_CONTENTS_H_
7 7
8 #include "content/browser/web_contents/web_contents_impl.h" 8 #include "content/browser/web_contents/web_contents_impl.h"
9 #include "content/public/common/page_transition_types.h" 9 #include "content/public/common/page_transition_types.h"
10 #include "content/public/test/web_contents_tester.h" 10 #include "content/public/test/web_contents_tester.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 53
54 // Overrides WebContentsImpl::ShouldTransitionCrossSite so that we can test 54 // Overrides WebContentsImpl::ShouldTransitionCrossSite so that we can test
55 // both alternatives without using command-line switches. 55 // both alternatives without using command-line switches.
56 bool ShouldTransitionCrossSite() { return transition_cross_site; } 56 bool ShouldTransitionCrossSite() { return transition_cross_site; }
57 57
58 // Prevent interaction with views. 58 // Prevent interaction with views.
59 virtual bool CreateRenderViewForRenderManager( 59 virtual bool CreateRenderViewForRenderManager(
60 RenderViewHost* render_view_host, 60 RenderViewHost* render_view_host,
61 int opener_route_id, 61 int opener_route_id,
62 int proxy_routing_id, 62 int proxy_routing_id,
63 bool for_main_frame) OVERRIDE; 63 CrossProcessFrameConnector* frame_connector) OVERRIDE;
64 virtual void UpdateRenderViewSizeForRenderManager() OVERRIDE {} 64 virtual void UpdateRenderViewSizeForRenderManager() OVERRIDE {}
65 65
66 // Returns a clone of this TestWebContents. The returned object is also a 66 // Returns a clone of this TestWebContents. The returned object is also a
67 // TestWebContents. The caller owns the returned object. 67 // TestWebContents. The caller owns the returned object.
68 virtual WebContents* Clone() OVERRIDE; 68 virtual WebContents* Clone() OVERRIDE;
69 69
70 // Set by individual tests. 70 // Set by individual tests.
71 bool transition_cross_site; 71 bool transition_cross_site;
72 72
73 // Allow mocking of the RenderViewHostDelegateView. 73 // Allow mocking of the RenderViewHostDelegateView.
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 bool expect_set_history_length_and_prune_; 132 bool expect_set_history_length_and_prune_;
133 scoped_refptr<const SiteInstanceImpl> 133 scoped_refptr<const SiteInstanceImpl>
134 expect_set_history_length_and_prune_site_instance_; 134 expect_set_history_length_and_prune_site_instance_;
135 int expect_set_history_length_and_prune_history_length_; 135 int expect_set_history_length_and_prune_history_length_;
136 int32 expect_set_history_length_and_prune_min_page_id_; 136 int32 expect_set_history_length_and_prune_min_page_id_;
137 }; 137 };
138 138
139 } // namespace content 139 } // namespace content
140 140
141 #endif // CONTENT_TEST_TEST_WEB_CONTENTS_H_ 141 #endif // CONTENT_TEST_TEST_WEB_CONTENTS_H_
OLDNEW
« no previous file with comments | « trunk/src/content/browser/web_contents/web_contents_impl.cc ('k') | trunk/src/content/test/test_web_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698