diff options
| author | bruthig <bruthig@chromium.org> | 2015-06-05 08:33:21 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-05 15:33:59 +0000 |
| commit | 5681d88c96e685a4e469105e8fcb382dc9893c9a (patch) | |
| tree | 8b3dea83daba769e1cdf9f4c9b3f46dadd7d09c3 /ash/shell.h | |
| parent | 74f13dc2b62abb34e947093fe2600f9c539e60ef (diff) | |
| download | chromium_src-5681d88c96e685a4e469105e8fcb382dc9893c9a.zip chromium_src-5681d88c96e685a4e469105e8fcb382dc9893c9a.tar.gz chromium_src-5681d88c96e685a4e469105e8fcb382dc9893c9a.tar.bz2 | |
Added an ActivationReason parameter to ActivationChangeObserver::OnWindowActivated(...).
TEST=FocusControllerApiTest.DuplicateActivationEvents
TEST=FocusControllerApiTest.ActivationEvents
TEST=FocusControllerMouseEventTest.DuplicateActivationEvents
TEST=FocusControllerMouseEventTest.ActivationEvents
TEST=FocusControllerGestureEventTest.DuplicateActivationEvents
TEST=FocusControllerGestureEventTest.ActivationEvents
TEST=FocusControllerHideTest.ActivationEvents
TEST=FocusControllerDestructionTest.ActivationEvents
TEST=FocusControllerRemovalTest.ActivationEvents
BUG=489813, 489814
Review URL: https://codereview.chromium.org/1151133003
Cr-Commit-Position: refs/heads/master@{#333048}
Diffstat (limited to 'ash/shell.h')
| -rw-r--r-- | ash/shell.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ash/shell.h b/ash/shell.h index 41af348..bba346b 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -617,8 +617,10 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate, void OnEvent(ui::Event* event) override; // Overridden from aura::client::ActivationChangeObserver: - void OnWindowActivated(aura::Window* gained_active, - aura::Window* lost_active) override; + void OnWindowActivated( + aura::client::ActivationChangeObserver::ActivationReason reason, + aura::Window* gained_active, + aura::Window* lost_active) override; static Shell* instance_; |