diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-12 20:17:24 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-12 20:17:24 +0000 |
| commit | bc86070a59cb7812fe9afd0dde467667fd0ea851 (patch) | |
| tree | 6f2f47549317fdcf24026715fa9166f1f1200475 /ash/shell.h | |
| parent | 6cbf3b96ca8ad1f68f6531b14739dddf2caada0f (diff) | |
| download | chromium_src-bc86070a59cb7812fe9afd0dde467667fd0ea851.zip chromium_src-bc86070a59cb7812fe9afd0dde467667fd0ea851.tar.gz chromium_src-bc86070a59cb7812fe9afd0dde467667fd0ea851.tar.bz2 | |
Revert 172624 - 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
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/11558027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172646 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
| -rw-r--r-- | ash/shell.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/ash/shell.h b/ash/shell.h index 5bd0fbf..b63010b 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -18,7 +18,6 @@ #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" @@ -127,10 +126,8 @@ class ShellTestApi; // // Upon creation, the Shell sets itself as the RootWindow's delegate, which // takes ownership of the Shell. -class ASH_EXPORT Shell - : public internal::SystemModalContainerEventFilterDelegate, - public ui::EventTarget, - public aura::client::ActivationChangeObserver { +class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate, + public ui::EventTarget { public: typedef std::vector<aura::RootWindow*> RootWindowList; typedef std::vector<internal::RootWindowController*> RootWindowControllerList; @@ -454,10 +451,6 @@ class ASH_EXPORT Shell 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 |