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

Unified Diff: content/browser/renderer_host/test_render_view_host.h

Issue 9473001: Extract minimal RenderViewHost interface for embedders, leaving (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to LKGR. Created 8 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/test_render_view_host.h
diff --git a/content/browser/renderer_host/test_render_view_host.h b/content/browser/renderer_host/test_render_view_host.h
index c3b03d82c1213746071e0f79a0d6cc1789ae521b..3679887ee492930efe80338d54be7001269828a4 100644
--- a/content/browser/renderer_host/test_render_view_host.h
+++ b/content/browser/renderer_host/test_render_view_host.h
@@ -189,12 +189,18 @@ class TestRenderWidgetHostView : public RenderWidgetHostViewBase {
} // namespace content
+#if defined(COMPILER_MSVC)
+// See comment for same warning on RenderViewHostImpl.
+#pragma warning(push)
+#pragma warning(disable: 4250)
+#endif
+
// TestRenderViewHost ----------------------------------------------------------
// TODO(brettw) this should use a TestTabContents which should be generalized
// from the TabContents test. We will probably also need that class' version of
// CreateRenderViewForRenderManager when more complicate tests start using this.
-class TestRenderViewHost : public RenderViewHost {
+class TestRenderViewHost : public RenderViewHostImpl {
public:
// If the given TabContnets has a pending RVH, returns it, otherwise NULL.
static TestRenderViewHost* GetPendingForController(
@@ -273,6 +279,10 @@ class TestRenderViewHost : public RenderViewHost {
int32 max_page_id) OVERRIDE;
virtual bool IsRenderViewLive() const OVERRIDE;
+ // This removes the need to expose
+ // RenderViewHostImpl::is_swapped_out() outside of content.
+ static bool IsRenderViewHostSwappedOut(RenderViewHost* rwh);
+
private:
FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, FilterNavigate);
@@ -292,6 +302,10 @@ class TestRenderViewHost : public RenderViewHost {
DISALLOW_COPY_AND_ASSIGN(TestRenderViewHost);
};
+#if defined(COMPILER_MSVC)
+#pragma warning(pop)
+#endif
+
// TestRenderViewHostFactory ---------------------------------------------------
// Manages creation of the RenderViewHosts using our special subclass. This
« no previous file with comments | « content/browser/renderer_host/resource_dispatcher_host.cc ('k') | content/browser/renderer_host/test_render_view_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698