Desktop aura: Use the X11 clipboard

ui/base/clipboard/clipboard.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_BASE_CLIPBOARD_CLIPBOARD_H_
 #define UI_BASE_CLIPBOARD_CLIPBOARD_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 11 matching lines @@
 #include <gdk/gdk.h>
 #endif
 
 #if defined(OS_ANDROID)
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #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;
 }
 
 class FilePath;
 class SkBitmap;
 
 #if defined(TOOLKIT_GTK)
 typedef struct _GtkClipboard GtkClipboard;
 #endif
@@ skipping 44 matching lines @@
 #elif defined(OS_MACOSX)
    public:
     FormatType(const FormatType& other);
     FormatType& operator=(const FormatType& other);
    private:
     explicit FormatType(NSString* native_format);
     NSString* ToNSString() const { return data_; }
     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);
     explicit FormatType(const GdkAtom& native_format);
     const GdkAtom& ToGdkAtom() const { return data_; }
     GdkAtom data_;
 #elif defined(OS_ANDROID)
     explicit FormatType(const std::string& native_format);
     const std::string& data() const { return data_; }
     int compare(const std::string& str) const { return data_.compare(str); }
@@ skipping 95 matching lines @@
   static void DestroyClipboardForCurrentThread();
 
   // Write a bunch of objects to the system clipboard. Copies are made of the
   // contents of |objects|. On Windows they are copied to the system clipboard.
   // On linux they are copied into a structure owned by the Clipboard object and
   // kept until the system clipboard is set again.
   void WriteObjects(Buffer buffer, const ObjectMap& objects);
 
   // 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
 
   // Returns a sequence number which uniquely identifies clipboard state.
   // This can be used to version the data on the clipboard and determine
   // whether it has changed.
   uint64 GetSequenceNumber(Buffer buffer);
 
   // Tests whether the clipboard contains a certain format
   bool IsFormatAvailable(const FormatType& format, Buffer buffer) const;
@@ skipping 142 matching lines @@
   void SetGtkClipboard(Buffer buffer);
   // Insert a mapping into clipboard_data_.
   void InsertMapping(const char* key, char* data, size_t data_len);
 
   // Find the gtk clipboard for the passed buffer enum.
   GtkClipboard* LookupBackingClipboard(Buffer clipboard) const;
 
   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);
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_CLIPBOARD_CLIPBOARD_H_