Remove old activation code and disable-focus-controller flags

ash/wm/base_layout_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/base_layout_manager.h"
 
 #include "ash/screen_ash.h"
 #include "ash/session_state_delegate.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
@@ skipping 136 matching lines @@
                                               const gfx::Rect& new_bounds) {
   if (root_window_ == window)
     AdjustAllWindowsBoundsForWorkAreaChange(ADJUST_WINDOW_DISPLAY_SIZE_CHANGED);
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // BaseLayoutManager, aura::client::ActivationChangeObserver implementation:
 
 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));
   }
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // BaseLayoutManager, protected:
 
 void BaseLayoutManager::ShowStateChanged(aura::Window* window,
                                          ui::WindowShowState last_show_state) {
   if (wm::IsWindowMinimized(window)) {
     // Save the previous show state so that we can correctly restore it.
@@ skipping 92 matching lines @@
           window, ScreenAsh::GetDisplayBoundsInParent(window));
       break;
 
     default:
       break;
   }
 }
 
 }  // namespace internal
 }  // namespace ash