Revert 177209 - Enable the FocusController on DesktopAura too.

ui/views/widget/desktop_aura/desktop_root_window_host_linux.cc

Index: ui/views/widget/desktop_aura/desktop_root_window_host_linux.cc
===================================================================
--- ui/views/widget/desktop_aura/desktop_root_window_host_linux.cc	(revision 177225)
+++ ui/views/widget/desktop_aura/desktop_root_window_host_linux.cc	(working copy)
@@ -23,13 +23,10 @@
 #include "ui/base/x/x11_util.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/corewm/compound_event_filter.h"
-#include "ui/views/corewm/corewm_switches.h"
-#include "ui/views/corewm/focus_controller.h"
 #include "ui/views/ime/input_method.h"
 #include "ui/views/widget/desktop_aura/desktop_activation_client.h"
 #include "ui/views/widget/desktop_aura/desktop_cursor_client.h"
 #include "ui/views/widget/desktop_aura/desktop_dispatcher_client.h"
-#include "ui/views/widget/desktop_aura/desktop_focus_rules.h"
 #include "ui/views/widget/desktop_aura/desktop_layout_manager.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/widget/desktop_aura/desktop_screen_position_client.h"
@@ -94,10 +91,6 @@
 
 DesktopRootWindowHostLinux::~DesktopRootWindowHostLinux() {
   root_window_->ClearProperty(kHostForRootWindow);
-  if (corewm::UseFocusController()) {
-    aura::client::SetFocusClient(root_window_, NULL);
-    aura::client::SetActivationClient(root_window_, NULL);
-  }
 }
 
 // static
@@ -221,18 +214,11 @@
   // messages to us.
   X11DesktopHandler::get();
 
-  if (corewm::UseFocusController()) {
-    corewm::FocusController* focus_controller =
-        new corewm::FocusController(new DesktopFocusRules);
-    focus_client_.reset(focus_controller);
-    aura::client::SetFocusClient(root_window_, focus_controller);
-    aura::client::SetActivationClient(root_window_, focus_controller);
-  } else {
-    focus_client_.reset(new aura::FocusManager);
-    aura::client::SetFocusClient(root_window_, focus_client_.get());
-    activation_client_.reset(new DesktopActivationClient(root_window_));
-  }
+  focus_client_.reset(new aura::FocusManager);
+  aura::client::SetFocusClient(root_window_, focus_client_.get());
 
+  activation_client_.reset(new DesktopActivationClient(root_window_));
+
   dispatcher_client_.reset(new DesktopDispatcherClient);
   aura::client::SetDispatcherClient(root_window_,
                                     dispatcher_client_.get());