diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-12 23:15:44 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-12 23:15:44 +0000 |
| commit | c4bcfc44764817c210c28de294eba448702b87fb (patch) | |
| tree | 20f28c6e15aa7b2eeadd277d069aba2baa8d8a7c /ash/wm | |
| parent | 44b69b4c2b7b4bcb444981e47e0728e9ffc407af (diff) | |
| download | chromium_src-c4bcfc44764817c210c28de294eba448702b87fb.zip chromium_src-c4bcfc44764817c210c28de294eba448702b87fb.tar.gz chromium_src-c4bcfc44764817c210c28de294eba448702b87fb.tar.bz2 | |
Adds the concept of toplevel windows to FocusRules.
http://crbug.com/162100
R=sky@chromium.org
Review URL: https://codereview.chromium.org/11475045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172694 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm')
| -rw-r--r-- | ash/wm/activation_controller.cc | 4 | ||||
| -rw-r--r-- | ash/wm/activation_controller.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/ash/wm/activation_controller.cc b/ash/wm/activation_controller.cc index 07d3ca9..274ab56 100644 --- a/ash/wm/activation_controller.cc +++ b/ash/wm/activation_controller.cc @@ -214,6 +214,10 @@ aura::Window* ActivationController::GetActivatableWindow(aura::Window* window) { return GetActivatableWindow(window, NULL); } +aura::Window* ActivationController::GetToplevelWindow(aura::Window* window) { + return GetActivatableWindow(window, NULL); +} + bool ActivationController::OnWillFocusWindow(aura::Window* window, const ui::Event* event) { return CanActivateWindowWithEvent( diff --git a/ash/wm/activation_controller.h b/ash/wm/activation_controller.h index 76e23db..24bf0508 100644 --- a/ash/wm/activation_controller.h +++ b/ash/wm/activation_controller.h @@ -56,6 +56,7 @@ class ASH_EXPORT ActivationController virtual void DeactivateWindow(aura::Window* window) OVERRIDE; virtual aura::Window* GetActiveWindow() OVERRIDE; virtual aura::Window* GetActivatableWindow(aura::Window* window) OVERRIDE; + virtual aura::Window* GetToplevelWindow(aura::Window* window) OVERRIDE; virtual bool OnWillFocusWindow(aura::Window* window, const ui::Event* event) OVERRIDE; virtual bool CanActivateWindow(aura::Window* window) const OVERRIDE; |