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

Unified Diff: chrome/browser/ui/views/bookmarks/bookmark_context_menu_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
Index: chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc
index 6ec3166d2ef4e2dc88d470b30624d3c00f2e9003..90f95ca142ba66b418b13101dd3c91219b59691c 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc
@@ -23,6 +23,7 @@
#include "grit/generated_resources.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/clipboard/clipboard.h"
+#include "ui/events/platform/platform_event_source.h"
#if defined(OS_WIN)
#include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
@@ -58,6 +59,7 @@ class BookmarkContextMenuTest : public testing::Test {
}
virtual void SetUp() OVERRIDE {
+ event_source_ = ui::PlatformEventSource::CreateDefault();
profile_.reset(new TestingProfile());
profile_->CreateBookmarkModel(true);
@@ -73,12 +75,14 @@ class BookmarkContextMenuTest : public testing::Test {
BrowserThread::GetBlockingPool()->FlushForTesting();
// Flush the message loop to make application verifiers happy.
message_loop_.RunUntilIdle();
+ event_source_.reset();
}
protected:
base::MessageLoopForUI message_loop_;
content::TestBrowserThread ui_thread_;
content::TestBrowserThread file_thread_;
+ scoped_ptr<ui::PlatformEventSource> event_source_;
scoped_ptr<TestingProfile> profile_;
BookmarkModel* model_;
TestingPageNavigator navigator_;
« no previous file with comments | « chrome/browser/extensions/global_shortcut_listener_x11.cc ('k') | mojo/services/native_viewport/native_viewport_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698