Make aura::clients take Window instead of RootWindow

ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h

 // 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.
 
 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_DRAG_DROP_CLIENT_AURAX11_H_
 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_DRAG_DROP_CLIENT_AURAX11_H_
 
+#include <set>
 #include <X11/Xlib.h>
 
-// Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class.
-#undef RootWindow
-
-#include <set>
-
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/window_observer.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/x/x11_atom_cache.h"
 #include "ui/views/views_export.h"
 #include "ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h"
 #include "ui/views/widget/desktop_aura/x11_whole_screen_move_loop_delegate.h"
 
 namespace aura {
-class RootWindow;
 namespace client {
 class DragDropDelegate;
 }
 }
 
 namespace gfx {
 class Point;
 }
 
 namespace ui {
 class DragSource;
 class DropTargetEvent;
 class OSExchangeData;
 class OSExchangeDataProviderAuraX11;
-class RootWindow;
 class SelectionFormatMap;
 }
 
 namespace views {
 class DesktopNativeCursorManager;
 
 // Implements drag and drop on X11 for aura. On one side, this class takes raw
 // X11 events forwarded from DesktopRootWindowHostLinux, while on the other, it
 // handles the views drag events.
 class VIEWS_EXPORT DesktopDragDropClientAuraX11
     : public aura::client::DragDropClient,
       public aura::WindowObserver,
       public X11WholeScreenMoveLoopDelegate {
  public:
   DesktopDragDropClientAuraX11(
-      aura::RootWindow* root_window,
+      aura::Window* root_window,
       views::DesktopNativeCursorManager* cursor_manager,
       Display* xdisplay,
       ::Window xwindow);
   virtual ~DesktopDragDropClientAuraX11();
 
   // We maintain a mapping of live DesktopDragDropClientAuraX11 objects to
   // their ::Windows. We do this so that we're able to short circuit sending
   // X11 messages to windows in our process.
   static DesktopDragDropClientAuraX11* GetForWindow(::Window window);
 
   // These methods handle the various X11 client messages from the platform.
   void OnXdndEnter(const XClientMessageEvent& event);
   void OnXdndLeave(const XClientMessageEvent& event);
   void OnXdndPosition(const XClientMessageEvent& event);
   void OnXdndStatus(const XClientMessageEvent& event);
   void OnXdndFinished(const XClientMessageEvent& event);
   void OnXdndDrop(const XClientMessageEvent& event);
 
   // Called when XSelection data has been copied to our process.
   void OnSelectionNotify(const XSelectionEvent& xselection);
 
   // Overridden from aura::client::DragDropClient:
   virtual int StartDragAndDrop(
       const ui::OSExchangeData& data,
-      aura::RootWindow* root_window,
+      aura::Window* root_window,
       aura::Window* source_window,
       const gfx::Point& root_location,
       int operation,
       ui::DragDropTypes::DragEventSource source) OVERRIDE;
   virtual void DragUpdate(aura::Window* target,
                           const ui::LocatedEvent& event) OVERRIDE;
   virtual void Drop(aura::Window* target,
                     const ui::LocatedEvent& event) OVERRIDE;
   virtual void DragCancel() OVERRIDE;
   virtual bool IsDragDropInProgress() OVERRIDE;
@@ skipping 53 matching lines @@
   void SendXdndDrop(::Window dest_window);
 
   // Sends |xev| to |xid|, optionally short circuiting the round trip to the X
   // server.
   void SendXClientEvent(::Window xid, XEvent* xev);
 
   // A nested message loop that notifies this object of events through the
   // X11WholeScreenMoveLoopDelegate interface.
   X11WholeScreenMoveLoop move_loop_;
 
-  aura::RootWindow* root_window_;
+  aura::Window* root_window_;
 
   Display* xdisplay_;
   ::Window xwindow_;
 
   ui::X11AtomCache atom_cache_;
 
   // Target side information.
   class X11DragContext;
   scoped_ptr<X11DragContext> target_current_context_;
 
@@ skipping 53 matching lines @@
   gfx::NativeCursor move_grab_cursor_;
 
   static std::map< ::Window, DesktopDragDropClientAuraX11*> g_live_client_map;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopDragDropClientAuraX11);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_DRAG_DROP_CLIENT_AURAX11_H_