Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2098)

Unified Diff: base/clipboard.h

Issue 174367: Change the ChromiumPasteboard to have a notion of an alternate clipboard... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | base/clipboard_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/clipboard.h
===================================================================
--- base/clipboard.h (revision 25640)
+++ base/clipboard.h (working copy)
@@ -74,6 +74,34 @@
typedef std::vector<ObjectMapParam> ObjectMapParams;
typedef std::map<int /* ObjectType */, ObjectMapParams> ObjectMap;
+ // Buffer designates which clipboard the action should be applied to.
+ // Only platforms that use the X Window System support the selection
+ // buffer. Furthermore we currently only use a buffer other than the
+ // standard buffer when reading from the clipboard so only those
+ // functions accept a buffer parameter.
+ enum Buffer {
+ BUFFER_STANDARD,
+#if defined(OS_LINUX)
+ BUFFER_SELECTION,
+#endif
+ };
+
+ static bool IsValidBuffer(int32 buffer) {
+ switch (buffer) {
+ case BUFFER_STANDARD:
+ return true;
+#if defined(OS_LINUX)
+ case BUFFER_SELECTION:
+ return true;
+#endif
+ }
+ return false;
+ }
+
+ static Buffer FromInt(int32 buffer) {
+ return static_cast<Buffer>(buffer);
+ }
+
Clipboard();
~Clipboard();
@@ -90,20 +118,21 @@
void WriteObjects(const ObjectMap& objects, base::ProcessHandle process);
// Tests whether the clipboard contains a certain format
- bool IsFormatAvailable(const FormatType& format) const;
+ bool IsFormatAvailable(const FormatType& format, Buffer buffer) const;
// As above, but instead of interpreting |format| by some platform-specific
// definition, interpret it as a literal MIME type.
- bool IsFormatAvailableByString(const std::string& format) const;
+ bool IsFormatAvailableByString(const std::string& format,
+ Buffer buffer) const;
// Reads UNICODE text from the clipboard, if available.
- void ReadText(string16* result) const;
+ void ReadText(Buffer buffer, string16* result) const;
// Reads ASCII text from the clipboard, if available.
- void ReadAsciiText(std::string* result) const;
+ void ReadAsciiText(Buffer buffer, std::string* result) const;
// Reads HTML from the clipboard, if available.
- void ReadHTML(string16* markup, std::string* src_url) const;
+ void ReadHTML(Buffer buffer, string16* markup, std::string* src_url) const;
// Reads a bookmark from the clipboard, if available.
void ReadBookmark(string16* title, std::string* url) const;
@@ -213,8 +242,12 @@
// 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_;
#endif
DISALLOW_COPY_AND_ASSIGN(Clipboard);
« no previous file with comments | « no previous file | base/clipboard_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698