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..a19dee74b7550feb063593011f416b301a3d864a 100644 |
--- a/ash/wm/ash_focus_rules.h |
+++ b/ash/wm/ash_focus_rules.h |
@@ -18,9 +18,8 @@ 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; |
+ // Set whether |window| should be activated on click event. |
+ static void SetActivateOnClick(aura::Window* window, bool activate_on_click); |
private: |
// ::wm::BaseFocusRules: |
@@ -29,6 +28,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( |