Remove old activation code and disable-focus-controller flags

ui/views/widget/desktop_aura/x11_window_event_filter.h

Index: ui/views/widget/desktop_aura/x11_window_event_filter.h
diff --git a/ui/views/widget/desktop_aura/x11_window_event_filter.h b/ui/views/widget/desktop_aura/x11_window_event_filter.h
index a6bdce8d3c8efe05c2caeaf09a56f5228ac843a0..1cf3f9c6b2af88f1e1e219326d6428e741551754 100644
--- a/ui/views/widget/desktop_aura/x11_window_event_filter.h
+++ b/ui/views/widget/desktop_aura/x11_window_event_filter.h
@@ -25,14 +25,12 @@ class Point;
 }
 
 namespace views {
-class DesktopActivationClient;
 class NativeWidgetAura;
 
 // An EventFilter that sets properties on X11 windows.
 class VIEWS_EXPORT X11WindowEventFilter : public ui::EventHandler {
  public:
-  explicit X11WindowEventFilter(aura::RootWindow* root_window,
-                                DesktopActivationClient* activation_client);
+  explicit X11WindowEventFilter(aura::RootWindow* root_window);
   virtual ~X11WindowEventFilter();
 
   // Changes whether borders are shown on this |root_window|.
@@ -47,8 +45,6 @@ class VIEWS_EXPORT X11WindowEventFilter : public ui::EventHandler {
   bool DispatchHostWindowDragMovement(int hittest,
                                       const gfx::Point& screen_location);
 
-  DesktopActivationClient* activation_client_;
-
   // The display and the native X window hosting the root window.
   Display* xdisplay_;
   ::Window xwindow_;