Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Unified Diff: ash/wm/ash_focus_rules.h

Issue 2809073002: cros: allow aura window not considered activatable for pointer event (Closed)
Patch Set: ui::Event* Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/wm/ash_focus_rules.cc » ('j') | ui/aura/client/aura_constants.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(
« no previous file with comments | « no previous file | ash/wm/ash_focus_rules.cc » ('j') | ui/aura/client/aura_constants.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698