Remove old activation code and disable-focus-controller flags

ui/views/widget/desktop_aura/desktop_activation_client.cc

Index: ui/views/widget/desktop_aura/desktop_activation_client.cc
diff --git a/ui/views/widget/desktop_aura/desktop_activation_client.cc b/ui/views/widget/desktop_aura/desktop_activation_client.cc
deleted file mode 100644
index dc8f062cc32d327470260207396c9e464d77b898..0000000000000000000000000000000000000000
--- a/ui/views/widget/desktop_aura/desktop_activation_client.cc
+++ /dev/null
@@ -1,190 +0,0 @@
-// 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 "ui/views/widget/desktop_aura/desktop_activation_client.h"
-
-#include "base/auto_reset.h"
-#include "base/compiler_specific.h"
-#include "ui/aura/client/activation_delegate.h"
-#include "ui/aura/client/activation_change_observer.h"
-#include "ui/aura/client/focus_client.h"
-#include "ui/aura/root_window.h"
-#include "ui/aura/window.h"
-
-namespace views {
-
-namespace {
-
-aura::Window* FindFocusableWindowFor(aura::Window* window) {
-  while (window && !window->CanFocus())
-    window = window->parent();
-  return window;
-}
-
-}  // namespace
-
-DesktopActivationClient::DesktopActivationClient(aura::RootWindow* root_window)
-    : root_window_(root_window),
-      current_active_(NULL),
-      updating_activation_(false),
-      observer_manager_(this) {
-  aura::client::GetFocusClient(root_window_)->AddObserver(this);
-  aura::client::SetActivationClient(root_window_, this);
-  root_window->AddPreTargetHandler(this);
-}
-
-DesktopActivationClient::~DesktopActivationClient() {
-  root_window_->RemovePreTargetHandler(this);
-  aura::client::GetFocusClient(root_window_)->RemoveObserver(this);
-  aura::client::SetActivationClient(root_window_, NULL);
-}
-
-void DesktopActivationClient::AddObserver(
-    aura::client::ActivationChangeObserver* observer) {
-  observers_.AddObserver(observer);
-}
-
-void DesktopActivationClient::RemoveObserver(
-    aura::client::ActivationChangeObserver* observer) {
-  observers_.RemoveObserver(observer);
-}
-
-void DesktopActivationClient::ActivateWindow(aura::Window* window) {
-  // Prevent recursion when called from focus.
-  if (updating_activation_)
-    return;
-
-  base::AutoReset<bool> in_activate_window(&updating_activation_, true);
-  // Nothing may actually have changed.
-  if (current_active_ == window)
-    return;
-  // The stacking client may impose rules on what window configurations can be
-  // activated or deactivated.
-  if (window && !CanActivateWindow(window))
-    return;
-  // Switch internal focus before we change the activation. Will probably cause
-  // recursion.
-  if (window &&
-      !window->Contains(aura::client::GetFocusClient(window)->
-          GetFocusedWindow())) {
-    aura::client::GetFocusClient(window)->FocusWindow(window);
-  }
-
-  aura::Window* old_active = current_active_;
-  current_active_ = window;
-  if (window && !observer_manager_.IsObserving(window))
-    observer_manager_.Add(window);
-
-  FOR_EACH_OBSERVER(aura::client::ActivationChangeObserver,
-                    observers_,
-                    OnWindowActivated(window, old_active));
-  aura::client::ActivationChangeObserver* observer =
-      aura::client::GetActivationChangeObserver(old_active);
-  if (observer)
-    observer->OnWindowActivated(window, old_active);
-  observer = aura::client::GetActivationChangeObserver(window);
-  if (observer)
-    observer->OnWindowActivated(window, old_active);
-}
-
-void DesktopActivationClient::DeactivateWindow(aura::Window* window) {
-  if (window == current_active_)
-    current_active_ = NULL;
-}
-
-aura::Window* DesktopActivationClient::GetActiveWindow() {
-  return current_active_;
-}
-
-aura::Window* DesktopActivationClient::GetActivatableWindow(
-    aura::Window* window) {
-  aura::Window* parent = window->parent();
-  aura::Window* child = window;
-  while (parent) {
-    if (CanActivateWindow(child))
-      return child;
-    // If |child| isn't activatable, but has transient parent, trace
-    // that path instead.
-    if (child->transient_parent())
-      return GetActivatableWindow(child->transient_parent());
-    parent = parent->parent();
-    child = child->parent();
-  }
-  return NULL;
-}
-
-aura::Window* DesktopActivationClient::GetToplevelWindow(aura::Window* window) {
-  aura::Window* parent = window->parent();
-  aura::Window* child = window;
-  aura::Window* root = child->GetRootWindow();
-  while (parent) {
-    if (parent == root)
-      return child;
-    parent = parent->parent();
-    child = child->parent();
-  }
-  return NULL;
-}
-
-bool DesktopActivationClient::OnWillFocusWindow(aura::Window* window,
-                                                const ui::Event* event) {
-  return CanActivateWindow(GetActivatableWindow(window));
-}
-
-void DesktopActivationClient::OnWindowDestroying(aura::Window* window) {
-  if (current_active_ == window) {
-    current_active_ = NULL;
-    FOR_EACH_OBSERVER(aura::client::ActivationChangeObserver,
-                      observers_,
-                      OnWindowActivated(NULL, window));
-
-    // ash::ActivationController will also activate the next window here; we
-    // don't do this because that's the desktop environment's job.
-  }
-  observer_manager_.Remove(window);
-}
-
-void DesktopActivationClient::OnWindowFocused(aura::Window* gained_focus,
-                                              aura::Window* lost_focus) {
-  if (gained_focus)
-    ActivateWindow(GetActivatableWindow(gained_focus));
-}
-
-bool DesktopActivationClient::CanActivateWindow(aura::Window* window) const {
-  return window &&
-      window->IsVisible() &&
-      (!aura::client::GetActivationDelegate(window) ||
-       aura::client::GetActivationDelegate(window)->ShouldActivate());
-}
-
-void DesktopActivationClient::OnKeyEvent(ui::KeyEvent* event) {
-}
-
-void DesktopActivationClient::OnMouseEvent(ui::MouseEvent* event) {
-  if (event->type() == ui::ET_MOUSE_PRESSED)
-    FocusWindowWithEvent(event);
-}
-
-void DesktopActivationClient::OnScrollEvent(ui::ScrollEvent* event) {
-}
-
-void DesktopActivationClient::OnTouchEvent(ui::TouchEvent* event) {
-}
-
-void DesktopActivationClient::OnGestureEvent(ui::GestureEvent* event) {
-  if (event->type() == ui::ET_GESTURE_BEGIN &&
-      event->details().touch_points() == 1) {
-    FocusWindowWithEvent(event);
-  }
-}
-
-void DesktopActivationClient::FocusWindowWithEvent(const ui::Event* event) {
-  aura::Window* window = static_cast<aura::Window*>(event->target());
-  if (GetActiveWindow() != window) {
-    aura::client::GetFocusClient(window)->FocusWindow(
-        FindFocusableWindowFor(window));
-  }
-}
-
-}  // namespace views