| Index: ui/aura_shell/stacking_controller.h
|
| ===================================================================
|
| --- ui/aura_shell/stacking_controller.h (revision 114099)
|
| +++ ui/aura_shell/stacking_controller.h (working copy)
|
| @@ -24,8 +24,15 @@
|
| // Initializes this controller.
|
| void Init();
|
|
|
| + // Returns true if |window| exists within a container that supports
|
| + // activation.
|
| + static aura::Window* GetActivatableWindow(aura::Window* window);
|
| +
|
| // Overridden from aura::StackingClient:
|
| virtual void AddChildToDefaultParent(aura::Window* window) OVERRIDE;
|
| + virtual bool CanActivateWindow(aura::Window* window) const OVERRIDE;
|
| + virtual aura::Window* GetTopmostWindowToActivate(
|
| + aura::Window* ignore) const OVERRIDE;
|
|
|
| private:
|
| // Returns corresponding modal container for a modal window.
|
|
|
| Property changes on: ui\aura_shell\stacking_controller.h
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
|
|
|
|