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

Unified Diff: ui/wm/core/focus_controller_unittest.cc

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
Index: ui/wm/core/focus_controller_unittest.cc
diff --git a/ui/wm/core/focus_controller_unittest.cc b/ui/wm/core/focus_controller_unittest.cc
index 110a47c8454cd6cf43687b2a9cecb997fe8d615d..65c9d7dc97ad402cd40f8027878d808e1beb89ac 100644
--- a/ui/wm/core/focus_controller_unittest.cc
+++ b/ui/wm/core/focus_controller_unittest.cc
@@ -335,9 +335,10 @@ class TestFocusRules : public BaseFocusRules {
CanFocusOrActivate(window) || window->Contains(focus_restriction_);
return can_activate ? BaseFocusRules::CanActivateWindow(window) : false;
}
- bool CanFocusWindow(aura::Window* window) const override {
- return CanFocusOrActivate(window) ?
- BaseFocusRules::CanFocusWindow(window) : false;
+ bool CanFocusWindow(aura::Window* window, ui::Event* event) const override {
+ return CanFocusOrActivate(window)
+ ? BaseFocusRules::CanFocusWindow(window, event)
+ : false;
}
aura::Window* GetActivatableWindow(aura::Window* window) const override {
return BaseFocusRules::GetActivatableWindow(

Powered by Google App Engine
This is Rietveld 408576698