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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/aura/desktop.cc

Issue 8564030: Revert 109966 - Grab-bag: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 | « ui/aura/desktop.h ('k') | ui/aura/desktop_host_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/desktop.cc
===================================================================
--- ui/aura/desktop.cc (revision 109970)
+++ ui/aura/desktop.cc (working copy)
@@ -323,14 +323,12 @@
}
void Desktop::SetActiveWindow(Window* window, Window* to_focus) {
- if (!window)
- return;
// The stacking client may impose rules on what window configurations can be
// activated or deactivated.
- if (!stacking_client_->CanActivateWindow(window))
+ if (window && !stacking_client_->CanActivateWindow(window))
return;
// The window may not be activate-able.
- if (!window->CanActivate())
+ if (window && !window->CanActivate())
return;
// Nothing may actually have changed.
if (active_window_ == window)
« no previous file with comments | « ui/aura/desktop.h ('k') | ui/aura/desktop_host_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698