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..9873ca0503da994d016d09ab1dbeb29db7d262f2 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 point events. On Chrome OS, |
|
sky
2017/04/17 16:08:47
point -> pointer
Qiang(Joe) Xu
2017/04/17 17:40:32
don by removing this.
|
| + // window 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 rule, which is BaseFocusRules::CanFocusWindow(window) for |window|. |
| + static void SetActivateOnPointer(aura::Window* window, |
|
sky
2017/04/17 16:08:47
Remove this function and instead set property dire
Qiang(Joe) Xu
2017/04/17 17:40:32
Done.
|
| + 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( |