Desktop aura: Use the X11 clipboard

ui/base/clipboard/clipboard.h

Index: ui/base/clipboard/clipboard.h
diff --git a/ui/base/clipboard/clipboard.h b/ui/base/clipboard/clipboard.h
index 18463da7472806a860d8faf7b3abc229c4933416..83891b08c261ae17b3a257e676f718233a27b5cb 100644
--- a/ui/base/clipboard/clipboard.h
+++ b/ui/base/clipboard/clipboard.h
@@ -29,6 +29,10 @@
 #include "base/android/scoped_java_ref.h"
 #endif
 
+#if defined(USE_AURA) && defined(USE_X11)
+#include "base/memory/scoped_ptr.h"
+#endif
+
 namespace gfx {
 class Size;
 }
@@ -93,7 +97,9 @@ class UI_EXPORT Clipboard : NON_EXPORTED_BASE(public base::ThreadChecker) {
     NSString* data_;
 #elif defined(USE_AURA)
     explicit FormatType(const std::string& native_format);
+   public:
     const std::string& ToString() const { return data_; }
+   private:
     std::string data_;
 #elif defined(TOOLKIT_GTK)
     explicit FormatType(const std::string& native_format);
@@ -209,10 +215,11 @@ class UI_EXPORT Clipboard : NON_EXPORTED_BASE(public base::ThreadChecker) {
 
   // On Linux/BSD, we need to know when the clipboard is set to a URL.  Most
   // platforms don't care.
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(USE_AURA) \
+#if defined(OS_WIN) || defined(OS_MACOSX)             \
+    || (defined(USE_AURA) && defined(OS_CHROMEOS))    \
     || defined(OS_ANDROID)
   void DidWriteURL(const std::string& utf8_text) {}
-#else  // !defined(OS_WIN) && !defined(OS_MACOSX)
+#else
   void DidWriteURL(const std::string& utf8_text);
 #endif
 
@@ -375,6 +382,12 @@ class UI_EXPORT Clipboard : NON_EXPORTED_BASE(public base::ThreadChecker) {
   TargetMap* clipboard_data_;
   GtkClipboard* clipboard_;
   GtkClipboard* primary_selection_;
+#elif defined(USE_AURA) && defined(USE_X11) && !defined(OS_CHROMEOS)
+ private:
+  // We keep our implementation details private because otherwise we bring in
+  // the X11 headers and break chrome compile.
+  class AuraX11Details;
+  scoped_ptr<AuraX11Details> aurax11_details_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(Clipboard);