| Index: ash/wm/ash_focus_rules.h
|
| diff --git a/ash/wm/ash_focus_rules.h b/ash/wm/ash_focus_rules.h
|
| index 97546cd7e977d34c2f6766cd1c0583e77cc77072..e3664d500cdd84de3f949964b71c2fe813337095 100644
|
| --- a/ash/wm/ash_focus_rules.h
|
| +++ b/ash/wm/ash_focus_rules.h
|
| @@ -18,10 +18,6 @@ class ASH_EXPORT AshFocusRules : public ::wm::BaseFocusRules {
|
| AshFocusRules();
|
| ~AshFocusRules() override;
|
|
|
| - // Tests if the given |window| can be activated, ignoring the system modal
|
| - // dialog state.
|
| - bool IsWindowConsideredActivatable(aura::Window* window) const;
|
| -
|
| private:
|
| // ::wm::BaseFocusRules:
|
| bool IsToplevelWindow(aura::Window* window) const override;
|
| @@ -29,6 +25,8 @@ class ASH_EXPORT AshFocusRules : public ::wm::BaseFocusRules {
|
| bool IsWindowConsideredVisibleForActivation(
|
| aura::Window* window) const override;
|
| bool CanActivateWindow(aura::Window* window) const override;
|
| + bool IsWindowConsideredActivatableForEvent(aura::Window* window,
|
| + ui::Event* event) const override;
|
| aura::Window* GetNextActivatableWindow(aura::Window* ignore) const override;
|
|
|
| aura::Window* GetTopmostWindowToActivateForContainerIndex(
|
|
|