diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-20 20:54:57 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-20 20:54:57 +0000 |
| commit | 7a60cd3a87912064436bc1f12d6b2ea3abddf961 (patch) | |
| tree | 35324f6c57f6f39ae9f733b2b133488ab8892022 /ash/sticky_keys | |
| parent | a72ef03eaa3b29a137c7d5953bcf3e124a76cf54 (diff) | |
| download | chromium_src-7a60cd3a87912064436bc1f12d6b2ea3abddf961.zip chromium_src-7a60cd3a87912064436bc1f12d6b2ea3abddf961.tar.gz chromium_src-7a60cd3a87912064436bc1f12d6b2ea3abddf961.tar.bz2 | |
Remove window/host accessors from WindowEventDispatcher. Include-What-You-Use for WindowTreeHost.
TBR=sky@chromium.org
http://crbug.com/308843
Review URL: https://codereview.chromium.org/196383014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258401 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/sticky_keys')
| -rw-r--r-- | ash/sticky_keys/sticky_keys_controller.cc | 5 | ||||
| -rw-r--r-- | ash/sticky_keys/sticky_keys_overlay_unittest.cc | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/ash/sticky_keys/sticky_keys_controller.cc b/ash/sticky_keys/sticky_keys_controller.cc index dd80cf1..812e46e 100644 --- a/ash/sticky_keys/sticky_keys_controller.cc +++ b/ash/sticky_keys/sticky_keys_controller.cc @@ -14,9 +14,10 @@ #include "base/basictypes.h" #include "base/debug/stack_trace.h" #include "ui/aura/window.h" -#include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_tracker.h" +#include "ui/aura/window_tree_host.h" #include "ui/events/event.h" +#include "ui/events/event_processor.h" #include "ui/events/keycodes/keyboard_code_conversion.h" namespace ash { @@ -86,7 +87,7 @@ void StickyKeysHandlerDelegateImpl::DispatchEvent(ui::Event* event, aura::Window* target) { DCHECK(target); ui::EventDispatchDetails details = - target->GetHost()->dispatcher()->OnEventFromSource(event); + target->GetHost()->event_processor()->OnEventFromSource(event); if (details.dispatcher_destroyed) return; } diff --git a/ash/sticky_keys/sticky_keys_overlay_unittest.cc b/ash/sticky_keys/sticky_keys_overlay_unittest.cc index 246481d..5a41e63 100644 --- a/ash/sticky_keys/sticky_keys_overlay_unittest.cc +++ b/ash/sticky_keys/sticky_keys_overlay_unittest.cc @@ -8,8 +8,9 @@ #include "ash/sticky_keys/sticky_keys_controller.h" #include "ash/test/ash_test_base.h" #include "base/memory/scoped_ptr.h" -#include "ui/aura/window_event_dispatcher.h" +#include "ui/aura/window_tree_host.h" #include "ui/events/event.h" +#include "ui/events/event_processor.h" namespace ash { @@ -41,7 +42,7 @@ class StickyKeysOverlayTest : public test::AshTestBase { dispatcher.set_target(Shell::GetInstance()->GetPrimaryRootWindow()); ui::EventDispatchDetails details = Shell::GetPrimaryRootWindow()-> - GetHost()->dispatcher()->OnEventFromSource(&event); + GetHost()->event_processor()->OnEventFromSource(&event); CHECK(!details.dispatcher_destroyed); } |