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

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

Issue 205253003: [master] x11: Move X event handling out of the message-pump. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix-merge Created 6 years, 9 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: 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 302409d2c6e14674ea6c1cfc3d038b17ab05bb7e..b73bf3d3ec3c9f39ece3a442a70b7af27259b7e8 100644
--- a/chrome/test/base/view_event_test_base.h
+++ b/chrome/test/base/view_event_test_base.h
@@ -34,6 +34,10 @@ namespace gfx {
class Size;
}
+namespace ui {
+class PlatformEventSource;
+}
+
namespace wm {
class WMState;
}
@@ -154,10 +158,9 @@ class ViewEventTestBase : public views::WidgetDelegate,
ui::ScopedOleInitializer ole_initializer_;
#endif
-#if defined(USE_AURA)
scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_;
scoped_ptr<wm::WMState> wm_state_;
-#endif
+ scoped_ptr<ui::PlatformEventSource> event_source_;
ChromeViewsDelegate views_delegate_;
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc ('k') | chrome/test/base/view_event_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698