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

Unified Diff: components/bookmarks/browser/bookmark_utils_unittest.cc

Issue 1892483005: SelectionOwner: add support for TIMESTAMP target (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address feedback Created 4 years, 8 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 | « components/bookmarks/browser/BUILD.gn ('k') | ui/base/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/bookmarks/browser/bookmark_utils_unittest.cc
diff --git a/components/bookmarks/browser/bookmark_utils_unittest.cc b/components/bookmarks/browser/bookmark_utils_unittest.cc
index f27676d8041dc392f055f221c33729b30bff869e..3f7b2036842d14600064be83094a7d4d8e44b353 100644
--- a/components/bookmarks/browser/bookmark_utils_unittest.cc
+++ b/components/bookmarks/browser/bookmark_utils_unittest.cc
@@ -20,6 +20,15 @@
#include "ui/base/clipboard/clipboard.h"
#include "ui/base/clipboard/scoped_clipboard_writer.h"
+#if defined(USE_X11)
+
+#include <memory>
+
+#include "ui/events/platform/x11/x11_event_source_glib.h" // nogncheck
+#include "ui/gfx/x/x11_types.h" // nogncheck
+
+#endif // defined(USE_X11)
+
using base::ASCIIToUTF16;
using std::string;
@@ -30,8 +39,12 @@ class BookmarkUtilsTest : public testing::Test,
public BaseBookmarkModelObserver {
public:
BookmarkUtilsTest()
- : grouped_changes_beginning_count_(0),
- grouped_changes_ended_count_(0) {}
+ : grouped_changes_beginning_count_(0), grouped_changes_ended_count_(0) {
+#if defined(USE_X11)
+ event_source_.reset(new ui::X11EventSourceGlib(gfx::GetXDisplay()));
+#endif // defined(USE_x11)
+ }
+
~BookmarkUtilsTest() override {}
// Copy and paste is not yet supported on iOS. http://crbug.com/228147
@@ -73,6 +86,11 @@ class BookmarkUtilsTest : public testing::Test,
// Clipboard requires a message loop.
base::MessageLoopForUI loop_;
+#if defined(USE_X11)
sadrul 2016/04/22 17:17:25 To be safe, guard all these with both USE_GLIB and
dcheng 2016/04/22 18:20:15 Done.
+ // On Linux, Clipboard also depends on an event source being present, to get
+ // the timestamp.
+ std::unique_ptr<ui::X11EventSourceGlib> event_source_;
+#endif // defined(USE_X11)
DISALLOW_COPY_AND_ASSIGN(BookmarkUtilsTest);
};
« no previous file with comments | « components/bookmarks/browser/BUILD.gn ('k') | ui/base/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698