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

Unified Diff: ash/shell_unittest.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
Index: ash/shell_unittest.cc
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc
index 781b32a638816ea173100ed12819bf008ca776b0..803c4a94bebd258fd8b10e6ee20f808fdde7cdb7 100644
--- a/ash/shell_unittest.cc
+++ b/ash/shell_unittest.cc
@@ -29,6 +29,7 @@
#include "ui/aura/window.h"
#include "ui/aura/window_event_dispatcher.h"
#include "ui/base/models/simple_menu_model.h"
+#include "ui/events/platform/platform_event_source.h"
#include "ui/events/test/events_test_utils.h"
#include "ui/events/test/test_event_handler.h"
#include "ui/gfx/size.h"
@@ -374,6 +375,8 @@ TEST_F(ShellTest, IsScreenLocked) {
}
TEST_F(ShellTest, LockScreenClosesActiveMenu) {
+ scoped_ptr<ui::PlatformEventSource> event_source(
+ ui::PlatformEventSource::CreateDefault());
SimpleMenuDelegate menu_delegate;
scoped_ptr<ui::SimpleMenuModel> menu_model(
new ui::SimpleMenuModel(&menu_delegate));
« no previous file with comments | « ash/shell/content_client/shell_browser_main_parts.cc ('k') | ash/wm/ash_native_cursor_manager_interactive_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698