diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-05 22:35:48 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-05 22:35:48 +0000 |
| commit | ff027885549e7e9d0c3e7b34ea4e14fd778f9417 (patch) | |
| tree | c7ba57f3521121f8b15f544b53dbc87bd62bf41c /ash/shell_unittest.cc | |
| parent | b015c23d13f42c34672d3eb91415f32d54b04f04 (diff) | |
| download | chromium_src-ff027885549e7e9d0c3e7b34ea4e14fd778f9417.zip chromium_src-ff027885549e7e9d0c3e7b34ea4e14fd778f9417.tar.gz chromium_src-ff027885549e7e9d0c3e7b34ea4e14fd778f9417.tar.bz2 | |
Makes Shell::GetParentTarget() return Env
This way EventHandlers added to Env are notified.
BUG=315155
TEST=covered by test.
R=sadrul@chromium.org
Review URL: https://codereview.chromium.org/60513002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233108 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell_unittest.cc')
| -rw-r--r-- | ash/shell_unittest.cc | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc index 309ebae..4004c20 100644 --- a/ash/shell_unittest.cc +++ b/ash/shell_unittest.cc @@ -24,7 +24,10 @@ #include "ash/wm/window_util.h" #include "base/strings/utf_string_conversions.h" #include "ui/aura/client/aura_constants.h" +#include "ui/aura/env.h" #include "ui/aura/root_window.h" +#include "ui/aura/test/event_generator.h" +#include "ui/aura/test/test_event_handler.h" #include "ui/aura/window.h" #include "ui/base/models/simple_menu_model.h" #include "ui/gfx/size.h" @@ -515,6 +518,16 @@ TEST_F(ShellTest, TestPreTargetHandlerOrder) { EXPECT_EQ(handlers[1], shell_test_api.drag_drop_controller()); } +// Verifies an EventHandler added to Env gets notified from EventGenerator. +TEST_F(ShellTest, EnvPreTargetHandler) { + aura::test::TestEventHandler event_handler; + aura::Env::GetInstance()->AddPreTargetHandler(&event_handler); + aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow()); + generator.MoveMouseBy(1, 1); + EXPECT_NE(0, event_handler.num_mouse_events()); + aura::Env::GetInstance()->RemovePreTargetHandler(&event_handler); +} + // This verifies WindowObservers are removed when a window is destroyed after // the Shell is destroyed. This scenario (aura::Windows being deleted after the // Shell) occurs if someone is holding a reference to an unparented Window, as |