diff options
| author | sadrul <sadrul@chromium.org> | 2015-11-30 11:10:02 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-30 19:11:32 +0000 |
| commit | 8eaf360dd14f8dfe5a0593bac5a4fe979f051a9d (patch) | |
| tree | bd883c04f293a26b397d12d9bb1cddd0047d4bca /ash | |
| parent | e2452b1f6a0fd3f6ce592acc9a7741dac7c6d76a (diff) | |
| download | chromium_src-8eaf360dd14f8dfe5a0593bac5a4fe979f051a9d.zip chromium_src-8eaf360dd14f8dfe5a0593bac5a4fe979f051a9d.tar.gz chromium_src-8eaf360dd14f8dfe5a0593bac5a4fe979f051a9d.tar.bz2 | |
events: EventTarget is not an EventHandler anymore.
An EventTarget can have a target-handler, and so the EventTarget itself
doesn't need to be an EventHandler. An aura::Window sets the
WindowDelegate as the target-handler, and a views::View installs itself
as the target-handler.
BUG=none
Review URL: https://codereview.chromium.org/1484513002
Cr-Commit-Position: refs/heads/master@{#362180}
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/shell.cc | 3 | ||||
| -rw-r--r-- | ash/shell.h | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index b021e7b..6ef7842 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -1163,9 +1163,6 @@ ui::EventTargeter* Shell::GetEventTargeter() { return nullptr; } -void Shell::OnEvent(ui::Event* event) { -} - //////////////////////////////////////////////////////////////////////////////// // Shell, aura::client::ActivationChangeObserver implementation: diff --git a/ash/shell.h b/ash/shell.h index 5bdf6dd..2e143ba 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -615,7 +615,6 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate, EventTarget* GetParentTarget() override; scoped_ptr<ui::EventTargetIterator> GetChildIterator() const override; ui::EventTargeter* GetEventTargeter() override; - void OnEvent(ui::Event* event) override; // Overridden from aura::client::ActivationChangeObserver: void OnWindowActivated( |