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

Unified Diff: content/test/test_render_view_host.h

Issue 2861533003: Backfill some UI tests. (Closed)
Patch Set: fix silent merge conflict Created 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/BUILD.gn ('k') | content/test/test_render_view_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/test_render_view_host.h
diff --git a/content/test/test_render_view_host.h b/content/test/test_render_view_host.h
index 9bbee7414f7423d21581dbee832ec0eddc195e40..b923434ed6ad620adcab791bafdf5bd1d930b975 100644
--- a/content/test/test_render_view_host.h
+++ b/content/test/test_render_view_host.h
@@ -24,6 +24,10 @@
#include "ui/base/page_transition_types.h"
#include "ui/gfx/geometry/vector2d_f.h"
+#if defined(USE_AURA)
+#include "ui/aura/window.h"
+#endif
+
// This file provides a testing framework for mocking out the RenderProcessHost
// layer. It allows you to test RenderViewHost, WebContentsImpl,
// NavigationController, and other layers above that without running an actual
@@ -61,7 +65,7 @@ class TestRenderWidgetHostView : public RenderWidgetHostViewBase {
explicit TestRenderWidgetHostView(RenderWidgetHost* rwh);
~TestRenderWidgetHostView() override;
- // RenderWidgetHostView implementation.
+ // RenderWidgetHostView:
void InitAsChild(gfx::NativeView parent_view) override {}
RenderWidgetHost* GetRenderWidgetHost() const override;
void SetSize(const gfx::Size& size) override {}
@@ -96,7 +100,7 @@ class TestRenderWidgetHostView : public RenderWidgetHostViewBase {
void ClearCompositorFrame() override {}
void SetNeedsBeginFrames(bool needs_begin_frames) override {}
- // RenderWidgetHostViewBase implementation.
+ // RenderWidgetHostViewBase:
void InitAsPopup(RenderWidgetHostView* parent_host_view,
const gfx::Rect& bounds) override {}
void InitAsFullscreen(RenderWidgetHostView* reference_host_view) override {}
@@ -135,6 +139,10 @@ class TestRenderWidgetHostView : public RenderWidgetHostViewBase {
bool did_change_compositor_frame_sink_ = false;
SkColor background_color_;
ui::DummyTextInputClient text_input_client_;
+
+#if defined(USE_AURA)
+ std::unique_ptr<aura::Window> window_;
+#endif
};
#if defined(COMPILER_MSVC)
« no previous file with comments | « chrome/test/BUILD.gn ('k') | content/test/test_render_view_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698