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

Unified Diff: ash/wm/base_layout_manager.cc

Issue 23874013: Remove old activation code and disable-focus-controller flags (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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: ash/wm/base_layout_manager.cc
diff --git a/ash/wm/base_layout_manager.cc b/ash/wm/base_layout_manager.cc
index 6842f3e3c0b070ed43ecdc6ca4d9d777f57b31c4..f22b07e68c6b16b258047c4aa1bb70d86eba80f9 100644
--- a/ash/wm/base_layout_manager.cc
+++ b/ash/wm/base_layout_manager.cc
@@ -154,12 +154,10 @@ void BaseLayoutManager::OnWindowBoundsChanged(aura::Window* window,
void BaseLayoutManager::OnWindowActivated(aura::Window* gained_active,
aura::Window* lost_active) {
- if (views::corewm::UseFocusController()) {
- if (gained_active && wm::IsWindowMinimized(gained_active) &&
- !gained_active->IsVisible()) {
- gained_active->Show();
- DCHECK(!wm::IsWindowMinimized(gained_active));
- }
+ if (gained_active && wm::IsWindowMinimized(gained_active) &&
+ !gained_active->IsVisible()) {
+ gained_active->Show();
+ DCHECK(!wm::IsWindowMinimized(gained_active));
}
}

Powered by Google App Engine
This is Rietveld 408576698