diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-12 17:49:27 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-12 17:49:27 +0000 |
| commit | 7721b8d8e5d2ca2044b40e11c783af918f2b3013 (patch) | |
| tree | 907ad174397f6ead3d79d982414881db28c80ddd /ash/shell.h | |
| parent | 47f73c9ede1ed4998ee4d291417433fe73bff017 (diff) | |
| download | chromium_src-7721b8d8e5d2ca2044b40e11c783af918f2b3013.zip chromium_src-7721b8d8e5d2ca2044b40e11c783af918f2b3013.tar.gz chromium_src-7721b8d8e5d2ca2044b40e11c783af918f2b3013.tar.bz2 | |
Remove a bunch of stuff related to Focus/Activation events.
http://crbug.com/162100
R=sadrul@chromium.org
Review URL: https://codereview.chromium.org/11537019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172624 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
| -rw-r--r-- | ash/shell.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/ash/shell.h b/ash/shell.h index b63010b..5bd0fbf 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -18,6 +18,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" +#include "ui/aura/client/activation_change_observer.h" #include "ui/base/events/event_target.h" #include "ui/gfx/insets.h" #include "ui/gfx/screen.h" @@ -126,8 +127,10 @@ class ShellTestApi; // // Upon creation, the Shell sets itself as the RootWindow's delegate, which // takes ownership of the Shell. -class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate, - public ui::EventTarget { +class ASH_EXPORT Shell + : public internal::SystemModalContainerEventFilterDelegate, + public ui::EventTarget, + public aura::client::ActivationChangeObserver { public: typedef std::vector<aura::RootWindow*> RootWindowList; typedef std::vector<internal::RootWindowController*> RootWindowControllerList; @@ -451,6 +454,10 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate, virtual EventTarget* GetParentTarget() OVERRIDE; virtual void OnEvent(ui::Event* event) OVERRIDE; + // Overridden from aura::client::ActivationChangeObserver: + virtual void OnWindowActivated(aura::Window* gained_active, + aura::Window* lost_active) OVERRIDE; + static Shell* instance_; // If set before the Shell is initialized, the mouse cursor will be hidden |