Remove old activation code and disable-focus-controller flags

ash/wm/overview/window_selector.cc

 // Copyright 2013 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/overview/window_selector.h"
 
 #include <algorithm>
 
 #include "ash/shell.h"
-#include "ash/wm/activation_controller.h"
 #include "ash/wm/mru_window_tracker.h"
 #include "ash/wm/overview/window_overview.h"
 #include "ash/wm/overview/window_selector_delegate.h"
 #include "ash/wm/overview/window_selector_window.h"
 #include "base/auto_reset.h"
 #include "base/timer/timer.h"
+#include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/base/events/event.h"
 #include "ui/base/events/event_handler.h"
 
 namespace ash {
 
 namespace {
 
@@ skipping 235 matching lines @@
   // If the window is in the windows_ list it needs to continue to be observed.
   if (std::find_if(windows_.begin(), windows_.end(),
           WindowSelectorWindowComparator(restore_focus_window_)) ==
               windows_.end()) {
     restore_focus_window_->RemoveObserver(this);
   }
   restore_focus_window_ = NULL;
 }
 
 }  // namespace ash