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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/test/base/view_event_test_base.h

Issue 21052007: aura: Clean up compositor initialization/destruction. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanupcompositor: All work maybe? Created 7 years, 5 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/base/in_process_browser_test.cc ('k') | chrome/test/base/view_event_test_base.cc » ('j') | content/browser/renderer_host/render_widget_host_view_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/view_event_test_base.h
diff --git a/chrome/test/base/view_event_test_base.h b/chrome/test/base/view_event_test_base.h
index c6c7be765054097610046d8ce575f2c65517aaf0..fb0f6f51e82a0e801bc6ad0897798bcb5a7d19bc 100644
--- a/chrome/test/base/view_event_test_base.h
+++ b/chrome/test/base/view_event_test_base.h
@@ -23,6 +23,12 @@
#include "ui/base/win/scoped_ole_initializer.h"
#endif
+namespace ash {
+namespace test {
+class AshTestHelper;
+}
+}
+
namespace aura {
namespace test {
class AuraTestHelper;
@@ -147,7 +153,9 @@ class ViewEventTestBase : public views::WidgetDelegate,
ui::ScopedOleInitializer ole_initializer_;
#endif
-#if defined(USE_AURA)
+#if defined(USE_ASH)
+ scoped_ptr<ash::test::AshTestHelper> ash_test_helper_;
+#elif defined(USE_AURA)
scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_;
#endif
« no previous file with comments | « chrome/test/base/in_process_browser_test.cc ('k') | chrome/test/base/view_event_test_base.cc » ('j') | content/browser/renderer_host/render_widget_host_view_browsertest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698