Remove old activation code and disable-focus-controller flags

ui/views/widget/desktop_aura/desktop_native_widget_aura.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 "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 
 #include "base/bind.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/cursor_client.h"
@@ skipping 848 matching lines @@
                                                 aura::Window* lost_active) {
   DCHECK(window_ == gained_active || window_ == lost_active);
   if ((window_ == gained_active || window_ == lost_active) &&
       IsVisible() && GetWidget()->non_client_view()) {
     GetWidget()->non_client_view()->SchedulePaint();
   }
   if (gained_active == window_ && restore_focus_on_activate_) {
     restore_focus_on_activate_ = false;
     GetWidget()->GetFocusManager()->RestoreFocusedView();
   } else if (lost_active == window_ && GetWidget()->HasFocusManager()) {
-    bool store_focused_view = corewm::UseFocusControllerOnDesktop();
-    if (!store_focused_view) {
-      // If we're losing focus to a window that is a top level (such as a
-      // bubble) store the focus. Such a window shares the same
-      // RootWindowHost, so that such a change won't trigger an activation
-      // change (which calls StoreFocusedView()). Without this the focused
-      // view is never told it lost focus.
-      aura::Window* focused_window =
-        aura::client::GetFocusClient(window_)->GetFocusedWindow();
-      if (focused_window && focused_window != window_) {
-        Widget* focused_widget =
-            Widget::GetWidgetForNativeWindow(focused_window);
-        store_focused_view = focused_widget && focused_widget != GetWidget() &&
-            focused_widget->is_top_level();
-      }
-    }
-    if (store_focused_view) {
-      DCHECK(!restore_focus_on_activate_);
-      restore_focus_on_activate_ = true;
-      // Pass in false so that ClearNativeFocus() isn't invoked.
-      GetWidget()->GetFocusManager()->StoreFocusedView(false);
-    }
+    DCHECK(!restore_focus_on_activate_);
+    restore_focus_on_activate_ = true;
+    // Pass in false so that ClearNativeFocus() isn't invoked.
+    GetWidget()->GetFocusManager()->StoreFocusedView(false);
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopNativeWidgetAura, aura::client::FocusChangeObserver implementation:
 
 void DesktopNativeWidgetAura::OnWindowFocused(aura::Window* gained_focus,
                                               aura::Window* lost_focus) {
   if (window_ == gained_focus) {
     desktop_root_window_host_->OnNativeWidgetFocus();
@@ skipping 60 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopNativeWidgetAura, NativeWidget implementation:
 
 ui::EventHandler* DesktopNativeWidgetAura::GetEventHandler() {
   return this;
 }
 
 }  // namespace views