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

Unified Diff: chrome/test/base/view_event_test_base.cc

Issue 9788001: Remove stops_event_propagation from Window, since it's broken. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 | « chrome/browser/ui/views/ash/chrome_shell_delegate.cc ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/view_event_test_base.cc
===================================================================
--- chrome/test/base/view_event_test_base.cc (revision 128508)
+++ chrome/test/base/view_event_test_base.cc (working copy)
@@ -17,6 +17,7 @@
#if defined(USE_AURA)
#include "ash/shell.h"
+#include "ui/aura/client/event_client.h"
#include "ui/aura/env.h"
#include "ui/aura/root_window.h"
#endif
@@ -81,6 +82,10 @@
ui::CompositorTestSupport::Initialize();
#if defined(USE_AURA)
ash::Shell::CreateInstance(NULL);
+ // The shell runs with a locked screen in tests, so we must clear the event
+ // client so it doesn't interfere with event propagation.
+ aura::client::SetEventClient(ash::Shell::GetInstance()->GetRootWindow(),
+ NULL);
#endif
window_ = views::Widget::CreateWindow(this);
}
« no previous file with comments | « chrome/browser/ui/views/ash/chrome_shell_delegate.cc ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698