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

Unified Diff: ui/wm/test/wm_test_helper.h

Issue 219743002: x11: Move X event handling out of the message-pump. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge-r261267 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
« no previous file with comments | « ui/wm/core/wm_state.cc ('k') | ui/wm/test/wm_test_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/wm/test/wm_test_helper.h
diff --git a/ui/wm/test/wm_test_helper.h b/ui/wm/test/wm_test_helper.h
index e01486b93318ec3c4e8e45ed36c288aa6eafa2a5..1bde9f33f7a3388c93f344a581ab50a9309cb34f 100644
--- a/ui/wm/test/wm_test_helper.h
+++ b/ui/wm/test/wm_test_helper.h
@@ -25,13 +25,15 @@ class Rect;
class Size;
}
-namespace wm {
-class CompoundEventFilter;
-class InputMethodEventFilter;
+namespace ui {
+class PlatformEventSource;
}
namespace wm {
+class CompoundEventFilter;
+class InputMethodEventFilter;
+
// Creates a minimal environment for running the shell. We can't pull in all of
// ash here, but we can create attach several of the same things we'd find in
// the ash parts of the code.
@@ -57,6 +59,7 @@ class WMTestHelper : public aura::client::WindowTreeClient {
scoped_ptr<wm::InputMethodEventFilter> input_method_filter_;
scoped_ptr<aura::client::DefaultActivationClient> activation_client_;
scoped_ptr<aura::client::FocusClient> focus_client_;
+ scoped_ptr<ui::PlatformEventSource> event_source_;
DISALLOW_COPY_AND_ASSIGN(WMTestHelper);
};
« no previous file with comments | « ui/wm/core/wm_state.cc ('k') | ui/wm/test/wm_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698