| Index: ash/wm/ash_activation_controller.h
|
| diff --git a/ash/wm/ash_activation_controller.h b/ash/wm/ash_activation_controller.h
|
| index 0e9be46659c9d8b7bd7a36d4ddee1298fb86e080..c3961f9a80fa07b5354c44d2c0921f4c747fa9f5 100644
|
| --- a/ash/wm/ash_activation_controller.h
|
| +++ b/ash/wm/ash_activation_controller.h
|
| @@ -5,6 +5,7 @@
|
| #ifndef ASH_WM_ASH_ACTIVATION_CONTROLLER_H_
|
| #define ASH_WM_ASH_ACTIVATION_CONTROLLER_H_
|
|
|
| +#include "ash/ash_export.h"
|
| #include "ash/wm/activation_controller_delegate.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/basictypes.h"
|
| @@ -12,7 +13,7 @@
|
| namespace ash {
|
| namespace internal {
|
|
|
| -class AshActivationController : public ActivationControllerDelegate {
|
| +class ASH_EXPORT AshActivationController : public ActivationControllerDelegate {
|
| public:
|
| AshActivationController();
|
| virtual ~AshActivationController();
|
| @@ -22,6 +23,11 @@ class AshActivationController : public ActivationControllerDelegate {
|
| virtual aura::Window* WillActivateWindow(aura::Window* window) OVERRIDE;
|
| virtual aura::Window* WillFocusWindow(aura::Window* window) OVERRIDE;
|
|
|
| + // Returns a handle to the launcher on the active root window which will
|
| + // be activated as fallback. Also notifies the launcher, so it can return
|
| + // true from Launcher::CanActivate().
|
| + aura::Window* PrepareToActivateLauncher();
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(AshActivationController);
|
| };
|
|
|
|
|