diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-22 23:35:56 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-22 23:35:56 +0000 |
| commit | 4b87bc2e3c13bd572a2b1b9a08ea2644120e6d6c (patch) | |
| tree | d1dd9f473c130f4e51a9cda7e8b49cb42c8f13bf /chrome/test | |
| parent | 4ad932db8c764a861f9c5a578599271f179a9020 (diff) | |
| download | chromium_src-4b87bc2e3c13bd572a2b1b9a08ea2644120e6d6c.zip chromium_src-4b87bc2e3c13bd572a2b1b9a08ea2644120e6d6c.tar.gz chromium_src-4b87bc2e3c13bd572a2b1b9a08ea2644120e6d6c.tar.bz2 | |
Revert 128328 - Remove stops_event_propagation from Window, since it's broken.
Changes it to be implemented by the Aura client, via a new interface EventClient.
The client can determine whether or not a given window and its subtree can receive events.
I also cleaned up the way screen locking is entered/exited via the delegate, and some stuff in ash/shell.
http://crbug.com/119347
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9788001
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9808044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128338 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/base/view_event_test_base.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc index 4f88ed1..e6c1ac1 100644 --- a/chrome/test/base/view_event_test_base.cc +++ b/chrome/test/base/view_event_test_base.cc @@ -17,7 +17,6 @@ #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 @@ -82,10 +81,6 @@ void ViewEventTestBase::SetUp() { 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); } |