Chromium Code Reviews| 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..76242bf2a74e9df07f00aa2c68bfc0a157422326 100644 |
| --- a/ash/wm/ash_focus_rules.h |
| +++ b/ash/wm/ash_focus_rules.h |
| @@ -18,9 +18,12 @@ 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 pointer. On Chrome OS, window |
|
sky
2017/04/12 19:49:16
pointer -> point events
Qiang(Joe) Xu
2017/04/12 23:00:41
Done.
|
| + // can be activated from input event, such as mouse pressed or single point |
| + // gesture tap. If |activate_on_pointer| is false, we disable the default |
| + // activation rule for |window|. |
|
sky
2017/04/12 19:49:16
Document what the default is.
Qiang(Joe) Xu
2017/04/12 23:00:41
Done.
|
| + static void SetActivateOnPointer(aura::Window* window, |
| + bool activate_on_pointer); |
| private: |
| // ::wm::BaseFocusRules: |
| @@ -29,6 +32,7 @@ class ASH_EXPORT AshFocusRules : public ::wm::BaseFocusRules { |
| bool IsWindowConsideredVisibleForActivation( |
| aura::Window* window) const override; |
| bool CanActivateWindow(aura::Window* window) const override; |
| + bool CanFocusWindow(aura::Window* window, ui::Event* event) const override; |
| aura::Window* GetNextActivatableWindow(aura::Window* ignore) const override; |
| aura::Window* GetTopmostWindowToActivateForContainerIndex( |