Desktop aura: Use the X11 clipboard

ui/aura/root_window_host_linux.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_AURA_ROOT_WINDOW_HOST_LINUX_H_
 #define UI_AURA_ROOT_WINDOW_HOST_LINUX_H_
 
 #include <X11/Xlib.h>
 
 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class.
 #undef RootWindow
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "ui/aura/root_window_host.h"
-#include "ui/aura/x11_atom_cache.h"
+#include "ui/base/x/x11_atom_cache.h"
 #include "ui/gfx/rect.h"
 
 namespace ui {
 class ViewProp;
 }
 
 namespace aura {
 
 class RootWindowHostLinux : public RootWindowHost,
                             public MessageLoop::Dispatcher {
@@ skipping 67 matching lines @@
   // The bounds of |x_root_window_|.
   gfx::Rect x_root_bounds_;
 
   // True if the window should be focused when the window is shown.
   bool focus_when_shown_;
 
   scoped_array<XID> pointer_barriers_;
 
   scoped_ptr<ui::ViewProp> prop_;
 
-  X11AtomCache atom_cache_;
+  ui::X11AtomCache atom_cache_;
 
   DISALLOW_COPY_AND_ASSIGN(RootWindowHostLinux);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_ROOT_WINDOW_HOST_LINUX_H_