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

Unified Diff: ash/shell.cc

Issue 11519040: More unittests passing with new focus controller. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years 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/shell.h ('k') | ash/wm/ash_focus_rules.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
===================================================================
--- ash/shell.cc (revision 172961)
+++ ash/shell.cc (working copy)
@@ -898,7 +898,8 @@
void Shell::OnWindowActivated(aura::Window* gained_active,
aura::Window* lost_active) {
- active_root_window_ = gained_active->GetRootWindow();
+ if (gained_active)
+ active_root_window_ = gained_active->GetRootWindow();
}
} // namespace ash
« no previous file with comments | « ash/shell.h ('k') | ash/wm/ash_focus_rules.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698