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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/wm/activation_controller.cc

Issue 11416292: Revert 170477 - Removes the |event| parameter from ActivationDelegate::ShouldActivate and makes the… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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 | « ash/test/test_activation_delegate.cc ('k') | chrome/browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/activation_controller.cc
===================================================================
--- ash/wm/activation_controller.cc (revision 170548)
+++ ash/wm/activation_controller.cc (working copy)
@@ -111,7 +111,7 @@
return window &&
VisibilityMatches(window, visibility_type) &&
(!aura::client::GetActivationDelegate(window) ||
- aura::client::GetActivationDelegate(window)->ShouldActivate()) &&
+ aura::client::GetActivationDelegate(window)->ShouldActivate(event)) &&
SupportsChildActivation(window->parent()) &&
(BelongsToContainerWithEqualOrGreaterId(
window, kShellWindowId_SystemModalContainer) ||
« no previous file with comments | « ash/test/test_activation_delegate.cc ('k') | chrome/browser/ui/ash/launcher/browser_launcher_item_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698