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

Unified Diff: ui/base/clipboard/clipboard_unittest.cc

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/base/clipboard/clipboard_aurax11.cc ('k') | ui/base/dragdrop/os_exchange_data_provider_aurax11.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/clipboard/clipboard_unittest.cc
diff --git a/ui/base/clipboard/clipboard_unittest.cc b/ui/base/clipboard/clipboard_unittest.cc
index 6df23998fdb6725cc9a70ea9adba6232f307c25e..30798d39de9c2ffc9076222a16eadaf4e43a7de1 100644
--- a/ui/base/clipboard/clipboard_unittest.cc
+++ b/ui/base/clipboard/clipboard_unittest.cc
@@ -32,6 +32,10 @@
#include "base/android/jni_string.h"
#endif
+#if defined(USE_AURA)
+#include "ui/events/platform/platform_event_source.h"
+#endif
+
using base::ASCIIToUTF16;
using base::UTF8ToUTF16;
using base::UTF16ToUTF8;
@@ -40,6 +44,12 @@ namespace ui {
class ClipboardTest : public PlatformTest {
public:
+#if defined(USE_AURA)
+ ClipboardTest() : event_source_(ui::PlatformEventSource::CreateDefault()) {}
+#else
+ ClipboardTest() {}
+#endif
+
static void WriteObjectsToClipboard(ui::Clipboard* clipboard,
const Clipboard::ObjectMap& objects) {
clipboard->WriteObjects(ui::CLIPBOARD_TYPE_COPY_PASTE, objects);
@@ -54,6 +64,9 @@ class ClipboardTest : public PlatformTest {
private:
base::MessageLoopForUI message_loop_;
+#if defined(USE_AURA)
+ scoped_ptr<PlatformEventSource> event_source_;
+#endif
Clipboard clipboard_;
};
« no previous file with comments | « ui/base/clipboard/clipboard_aurax11.cc ('k') | ui/base/dragdrop/os_exchange_data_provider_aurax11.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698