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

Unified Diff: ui/aura/desktop/desktop_activation_client.cc

Issue 10378002: Aura desktop: Really implement DesktopActivationClient::OnWillFocusWindow(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/desktop/desktop_activation_client.cc
diff --git a/ui/aura/desktop/desktop_activation_client.cc b/ui/aura/desktop/desktop_activation_client.cc
index 38e0e4635179111d27747bee0c182c3b1566af41..183a0ee7184139e047956c3119cd1bb6cf36593d 100644
--- a/ui/aura/desktop/desktop_activation_client.cc
+++ b/ui/aura/desktop/desktop_activation_client.cc
@@ -66,8 +66,7 @@ aura::Window* DesktopActivationClient::GetActiveWindow() {
bool DesktopActivationClient::OnWillFocusWindow(Window* window,
const Event* event) {
- // TODO(erg): Is this OK? Logic is much more nuanced in ash.
- return true;
+ return CanActivateWindow(window);
}
void DesktopActivationClient::OnWindowFocused(aura::Window* window) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698