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

Unified Diff: ash/wm/ash_native_cursor_manager_interactive_uitest.cc

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
« no previous file with comments | « ash/shell_unittest.cc ('k') | base/message_loop/message_loop.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/ash_native_cursor_manager_interactive_uitest.cc
diff --git a/ash/wm/ash_native_cursor_manager_interactive_uitest.cc b/ash/wm/ash_native_cursor_manager_interactive_uitest.cc
index 771b725e9a568b7ad735b121eff35d8d60900f9d..c17242381e26fec542bc490b09468b37a6eafa06 100644
--- a/ash/wm/ash_native_cursor_manager_interactive_uitest.cc
+++ b/ash/wm/ash_native_cursor_manager_interactive_uitest.cc
@@ -15,6 +15,7 @@
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/test/ui_controls.h"
#include "ui/base/ui_base_paths.h"
+#include "ui/events/platform/platform_event_source.h"
#include "ui/gl/gl_surface.h"
#if defined(USE_X11)
@@ -35,6 +36,7 @@ class AshNativeCursorManagerTest : public test::AshTestBase {
virtual void SetUp() OVERRIDE {
gfx::GLSurface::InitializeOneOffForTests();
+ event_source_ = ui::PlatformEventSource::CreateDefault();
ui::RegisterPathProvider();
ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
base::FilePath resources_pack_path;
@@ -46,6 +48,11 @@ class AshNativeCursorManagerTest : public test::AshTestBase {
test::AshTestBase::SetUp();
}
+
+ private:
+ scoped_ptr<ui::PlatformEventSource> event_source_;
+
+ DISALLOW_COPY_AND_ASSIGN(AshNativeCursorManagerTest);
};
namespace {
« no previous file with comments | « ash/shell_unittest.cc ('k') | base/message_loop/message_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698