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

Unified Diff: trunk/src/ash/test/ash_test_base.h

Issue 286753002: Revert 270290 "Reduce creation of ViewsDelegate" (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/ash/screensaver/screensaver_view_unittest.cc ('k') | trunk/src/ash/test/ash_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ash/test/ash_test_base.h
===================================================================
--- trunk/src/ash/test/ash_test_base.h (revision 270304)
+++ trunk/src/ash/test/ash_test_base.h (working copy)
@@ -13,16 +13,13 @@
#include "content/public/test/test_browser_thread_bundle.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/skia/include/core/SkColor.h"
+#include "ui/views/test/test_views_delegate.h"
#include "ui/wm/public/window_types.h"
#if defined(OS_WIN)
#include "ui/base/win/scoped_ole_initializer.h"
#endif
-namespace gfx {
-class Rect;
-}
-
namespace aura {
class RootWindow;
class Window;
@@ -45,6 +42,14 @@
class TestMetroViewerProcessHost;
#endif
+class AshTestViewsDelegate : public views::TestViewsDelegate {
+ public:
+ // Overriden from TestViewsDelegate.
+ virtual content::WebContents* CreateWebContents(
+ content::BrowserContext* browser_context,
+ content::SiteInstance* site_instance) OVERRIDE;
+};
+
class AshTestBase : public testing::Test {
public:
AshTestBase();
« no previous file with comments | « trunk/src/ash/screensaver/screensaver_view_unittest.cc ('k') | trunk/src/ash/test/ash_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698