Revert of Linux Aura: Make tab dragging great again

ui/views/widget/desktop_aura/desktop_window_tree_host_x11.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_window_tree_host_x11.h"
 
 #include <X11/extensions/shape.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/Xatom.h>
 #include <X11/Xregion.h>
@@ skipping 42 matching lines @@
 #include "ui/views/corewm/tooltip_aura.h"
 #include "ui/views/linux_ui/linux_ui.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/views_switches.h"
 #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h"
 #include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_observer_x11.h"
 #include "ui/views/widget/desktop_aura/x11_desktop_handler.h"
 #include "ui/views/widget/desktop_aura/x11_desktop_window_move_client.h"
-#include "ui/views/widget/desktop_aura/x11_desktop_window_move_client_managed.h"
 #include "ui/views/widget/desktop_aura/x11_pointer_grab.h"
 #include "ui/views/widget/desktop_aura/x11_window_event_filter.h"
 #include "ui/wm/core/compound_event_filter.h"
 #include "ui/wm/core/window_util.h"
 
 DECLARE_WINDOW_PROPERTY_TYPE(views::DesktopWindowTreeHostX11*);
 
 namespace views {
 
 DesktopWindowTreeHostX11* DesktopWindowTreeHostX11::g_current_capture =
     NULL;
 std::list<XID>* DesktopWindowTreeHostX11::open_windows_ = NULL;
 
 DEFINE_WINDOW_PROPERTY_KEY(
     aura::Window*, kViewsWindowForRootWindow, NULL);
 
 DEFINE_WINDOW_PROPERTY_KEY(
     DesktopWindowTreeHostX11*, kHostForRootWindow, NULL);
 
 namespace {
 
 // Constants that are part of EWMH.
 const int k_NET_WM_STATE_ADD = 1;
 const int k_NET_WM_STATE_REMOVE = 0;
 
 // Special value of the _NET_WM_DESKTOP property which indicates that the window
 // should appear on all desktops.
 const int kAllDesktops = 0xFFFFFFFF;
 
-const char* kAtomsToCache[] = {"UTF8_STRING",
-                               "WM_DELETE_WINDOW",
-                               "WM_PROTOCOLS",
-                               "_NET_ACTIVE_WINDOW",
-                               "_NET_FRAME_EXTENTS",
-                               "_NET_WM_CM_S0",
-                               "_NET_WM_DESKTOP",
-                               "_NET_WM_ICON",
-                               "_NET_WM_MOVERESIZE",
-                               "_NET_WM_NAME",
-                               "_NET_WM_PID",
-                               "_NET_WM_PING",
-                               "_NET_WM_STATE",
-                               "_NET_WM_STATE_ABOVE",
-                               "_NET_WM_STATE_FULLSCREEN",
-                               "_NET_WM_STATE_HIDDEN",
-                               "_NET_WM_STATE_MAXIMIZED_HORZ",
-                               "_NET_WM_STATE_MAXIMIZED_VERT",
-                               "_NET_WM_STATE_SKIP_TASKBAR",
-                               "_NET_WM_STATE_STICKY",
-                               "_NET_WM_USER_TIME",
-                               "_NET_WM_WINDOW_OPACITY",
-                               "_NET_WM_WINDOW_TYPE",
-                               "_NET_WM_WINDOW_TYPE_DND",
-                               "_NET_WM_WINDOW_TYPE_MENU",
-                               "_NET_WM_WINDOW_TYPE_NORMAL",
-                               "_NET_WM_WINDOW_TYPE_NOTIFICATION",
-                               "_NET_WM_WINDOW_TYPE_TOOLTIP",
-                               "XdndActionAsk",
-                               "XdndActionCopy",
-                               "XdndActionLink",
-                               "XdndActionList",
-                               "XdndActionMove",
-                               "XdndActionPrivate",
-                               "XdndAware",
-                               "XdndDrop",
-                               "XdndEnter",
-                               "XdndFinished",
-                               "XdndLeave",
-                               "XdndPosition",
-                               "XdndProxy",  // Proxy windows?
-                               "XdndSelection",
-                               "XdndStatus",
-                               "XdndTypeList",
-                               NULL};
+const char* kAtomsToCache[] = {
+  "UTF8_STRING",
+  "WM_DELETE_WINDOW",
+  "WM_PROTOCOLS",
+  "_NET_ACTIVE_WINDOW",
+  "_NET_FRAME_EXTENTS",
+  "_NET_WM_CM_S0",
+  "_NET_WM_DESKTOP",
+  "_NET_WM_ICON",
+  "_NET_WM_NAME",
+  "_NET_WM_PID",
+  "_NET_WM_PING",
+  "_NET_WM_STATE",
+  "_NET_WM_STATE_ABOVE",
+  "_NET_WM_STATE_FULLSCREEN",
+  "_NET_WM_STATE_HIDDEN",
+  "_NET_WM_STATE_MAXIMIZED_HORZ",
+  "_NET_WM_STATE_MAXIMIZED_VERT",
+  "_NET_WM_STATE_SKIP_TASKBAR",
+  "_NET_WM_STATE_STICKY",
+  "_NET_WM_USER_TIME",
+  "_NET_WM_WINDOW_OPACITY",
+  "_NET_WM_WINDOW_TYPE",
+  "_NET_WM_WINDOW_TYPE_DND",
+  "_NET_WM_WINDOW_TYPE_MENU",
+  "_NET_WM_WINDOW_TYPE_NORMAL",
+  "_NET_WM_WINDOW_TYPE_NOTIFICATION",
+  "_NET_WM_WINDOW_TYPE_TOOLTIP",
+  "XdndActionAsk",
+  "XdndActionCopy",
+  "XdndActionLink",
+  "XdndActionList",
+  "XdndActionMove",
+  "XdndActionPrivate",
+  "XdndAware",
+  "XdndDrop",
+  "XdndEnter",
+  "XdndFinished",
+  "XdndLeave",
+  "XdndPosition",
+  "XdndProxy",  // Proxy windows?
+  "XdndSelection",
+  "XdndStatus",
+  "XdndTypeList",
+  NULL
+};
 
 const char kX11WindowRolePopup[] = "popup";
 const char kX11WindowRoleBubble[] = "bubble";
 
 // Returns the whole path from |window| to the root.
 std::vector<::Window> GetParentsList(XDisplay* xdisplay, ::Window window) {
   ::Window parent_win, root_win;
   Window* child_windows;
   unsigned int num_child_windows;
   std::vector<::Window> result;
@@ skipping 21 matching lines @@
     case XINotifyPassiveUngrab:
       return NotifyUngrab;
     case XINotifyWhileGrabbed:
       return NotifyWhileGrabbed;
     default:
       NOTREACHED();
       return NotifyNormal;
   }
 }
 
-bool CanUseManagedWindowMove() {
-  if (!ui::IsXInput2Available() ||
-      !ui::WmSupportsHint(ui::GetAtom("_NET_WM_MOVERESIZE")))
-    return false;
-  switch(ui::GuessWindowManager()) {
-    case ui::WM_COMPIZ:
-    case ui::WM_METACITY:
-    case ui::WM_MUFFIN:
-    case ui::WM_MUTTER:
-      return true;
-    case ui::WM_XFWM4:
-      // Xfwm does not release the pointer grab when the dragging window gets
-      // destroyed (dragged into another window), and does not support
-      // _NET_WM_MOVERESIZE_CANCEL.
-      return false;
-    default:
-      // Whitelist only tested WMs.
-      return false;
-  }
-}
-
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopWindowTreeHostX11, public:
 
 DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
     internal::NativeWidgetDelegate* native_widget_delegate,
     DesktopNativeWidgetAura* desktop_native_widget_aura)
     : xdisplay_(gfx::GetXDisplay()),
       xwindow_(0),
@@ skipping 275 matching lines @@
   // Ensure that the X11DesktopHandler exists so that it tracks create/destroy
   // notify events.
   X11DesktopHandler::get();
 
   // TODO(erg): Unify this code once the other consumer goes away.
   SwapNonClientEventHandler(
       std::unique_ptr<ui::EventHandler>(new X11WindowEventFilter(this)));
   SetUseNativeFrame(params.type == Widget::InitParams::TYPE_WINDOW &&
                     !params.remove_standard_frame);
 
-
-  static bool can_use_managed_move = CanUseManagedWindowMove();
-  if (can_use_managed_move && is_managed_)
-    x11_window_move_client_.reset(new X11DesktopWindowMoveClientManaged);
-  else
-    x11_window_move_client_.reset(new X11DesktopWindowMoveClient);
+  x11_window_move_client_.reset(new X11DesktopWindowMoveClient);
   aura::client::SetWindowMoveClient(window(), x11_window_move_client_.get());
 
   SetWindowTransparency();
 
   native_widget_delegate_->OnNativeWidgetCreated(true);
 }
 
 std::unique_ptr<corewm::Tooltip> DesktopWindowTreeHostX11::CreateTooltip() {
   return base::WrapUnique(new corewm::TooltipAura);
 }
@@ skipping 867 matching lines @@
       window_type = atom_cache_.GetAtom("_NET_WM_WINDOW_TYPE_DND");
       break;
     default:
       window_type = atom_cache_.GetAtom("_NET_WM_WINDOW_TYPE_NORMAL");
       break;
   }
   // An in-activatable window should not interact with the system wm.
   if (!activatable_)
     swa.override_redirect = True;
 
-  is_managed_ = !swa.override_redirect;
   if (swa.override_redirect)
     attribute_mask |= CWOverrideRedirect;
 
   bool enable_transparent_visuals;
   switch (params.opacity) {
     case Widget::InitParams::OPAQUE_WINDOW:
       enable_transparent_visuals = false;
       break;
     case Widget::InitParams::TRANSLUCENT_WINDOW:
       enable_transparent_visuals = true;
@@ skipping 975 matching lines @@
   if (linux_ui) {
     ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window);
     if (native_theme)
       return native_theme;
   }
 
   return ui::NativeThemeAura::instance();
 }
 
 }  // namespace views