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

Unified Diff: ui/base/clipboard/clipboard.h

Issue 9232075: Have ScopedClipboardWriter and Clipboard::WriteObjects take a buffer parameter. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fix build error. Created 8 years, 10 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 | « content/browser/renderer_host/clipboard_message_filter.cc ('k') | ui/base/clipboard/clipboard_aurax11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/clipboard/clipboard.h
diff --git a/ui/base/clipboard/clipboard.h b/ui/base/clipboard/clipboard.h
index ddfe5312293f6fefbf995d4fb952ab66b76566d5..98904c0065f971759808f5cfe82162d082b11d24 100644
--- a/ui/base/clipboard/clipboard.h
+++ b/ui/base/clipboard/clipboard.h
@@ -149,9 +149,7 @@ class UI_EXPORT Clipboard {
// 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.
+ // buffer.
enum Buffer {
BUFFER_STANDARD,
BUFFER_SELECTION,
@@ -180,7 +178,7 @@ class UI_EXPORT Clipboard {
// 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(const ObjectMap& objects);
+ 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.
@@ -326,7 +324,7 @@ class UI_EXPORT Clipboard {
private:
// Write changes to gtk clipboard.
- void SetGtkClipboard();
+ void SetGtkClipboard(Buffer buffer);
// Insert a mapping into clipboard_data_.
void InsertMapping(const char* key, char* data, size_t data_len);
« no previous file with comments | « content/browser/renderer_host/clipboard_message_filter.cc ('k') | ui/base/clipboard/clipboard_aurax11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698