diff options
author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-04 06:19:37 +0000 |
---|---|---|
committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-04 06:19:37 +0000 |
commit | c6562f4b883b37a288205a206bdadf9a37978bf3 (patch) | |
tree | 1a576398bcb2cd32e972449068bc1b66324df84f /ui | |
parent | 5d2cded762eacf51f77021b3de61de430f50a9d8 (diff) | |
download | chromium_src-c6562f4b883b37a288205a206bdadf9a37978bf3.zip chromium_src-c6562f4b883b37a288205a206bdadf9a37978bf3.tar.gz chromium_src-c6562f4b883b37a288205a206bdadf9a37978bf3.tar.bz2 |
Add glue for supporting custom MIME types in DataTransfer.
BUG=31037
TEST=none in this patch, will be landed in WebKit as layout tests.
Review URL: http://codereview.chromium.org/8775025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112927 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r-- | ui/base/clipboard/clipboard.h | 4 | ||||
-rw-r--r-- | ui/base/clipboard/clipboard_aurax11.cc | 7 | ||||
-rw-r--r-- | ui/base/clipboard/clipboard_gtk.cc | 7 | ||||
-rw-r--r-- | ui/base/clipboard/clipboard_mac.mm | 7 | ||||
-rw-r--r-- | ui/base/clipboard/clipboard_win.cc | 7 |
5 files changed, 32 insertions, 0 deletions
diff --git a/ui/base/clipboard/clipboard.h b/ui/base/clipboard/clipboard.h index 9c010e4..a3e9181 100644 --- a/ui/base/clipboard/clipboard.h +++ b/ui/base/clipboard/clipboard.h @@ -156,6 +156,10 @@ class UI_EXPORT Clipboard { // Reads an image from the clipboard, if available. SkBitmap ReadImage(Buffer buffer) const; + void ReadCustomData(Buffer buffer, + const string16& type, + string16* result) const; + // Reads a bookmark from the clipboard, if available. void ReadBookmark(string16* title, std::string* url) const; diff --git a/ui/base/clipboard/clipboard_aurax11.cc b/ui/base/clipboard/clipboard_aurax11.cc index 793c996..c6fa094 100644 --- a/ui/base/clipboard/clipboard_aurax11.cc +++ b/ui/base/clipboard/clipboard_aurax11.cc @@ -240,6 +240,13 @@ SkBitmap Clipboard::ReadImage(Buffer buffer) const { return image; } +void Clipboard::ReadCustomData(Buffer buffer, + const string16& type, + string16* result) const { + // TODO(dcheng): Implement this. + NOTIMPLEMENTED(); +} + void Clipboard::ReadBookmark(string16* title, std::string* url) const { *title = UTF8ToUTF16(GetClipboardData()->bookmark_title()); *url = GetClipboardData()->bookmark_url(); diff --git a/ui/base/clipboard/clipboard_gtk.cc b/ui/base/clipboard/clipboard_gtk.cc index e9af2f3..83f232c 100644 --- a/ui/base/clipboard/clipboard_gtk.cc +++ b/ui/base/clipboard/clipboard_gtk.cc @@ -488,6 +488,13 @@ SkBitmap Clipboard::ReadImage(Buffer buffer) const { return canvas.ExtractBitmap(); } +void Clipboard::ReadCustomData(Buffer buffer, + const string16& type, + string16* result) const { + // TODO(dcheng): Implement this. + NOTIMPLEMENTED(); +} + void Clipboard::ReadBookmark(string16* title, std::string* url) const { // TODO(estade): implement this. NOTIMPLEMENTED(); diff --git a/ui/base/clipboard/clipboard_mac.mm b/ui/base/clipboard/clipboard_mac.mm index e97cd81..ebeb907 100644 --- a/ui/base/clipboard/clipboard_mac.mm +++ b/ui/base/clipboard/clipboard_mac.mm @@ -284,6 +284,13 @@ SkBitmap Clipboard::ReadImage(Buffer buffer) const { return canvas.ExtractBitmap(); } +void Clipboard::ReadCustomData(Buffer buffer, + const string16& type, + string16* result) const { + // TODO(dcheng): Implement this. + NOTIMPLEMENTED(); +} + void Clipboard::ReadBookmark(string16* title, std::string* url) const { NSPasteboard* pb = GetPasteboard(); diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc index a543fe6..a3f050e 100644 --- a/ui/base/clipboard/clipboard_win.cc +++ b/ui/base/clipboard/clipboard_win.cc @@ -544,6 +544,13 @@ SkBitmap Clipboard::ReadImage(Buffer buffer) const { return canvas.ExtractBitmap(); } +void Clipboard::ReadCustomData(Buffer buffer, + const string16& type, + string16* result) const { + // TODO(dcheng): Implement this. + NOTIMPLEMENTED(); +} + void Clipboard::ReadBookmark(string16* title, std::string* url) const { if (title) title->clear(); |