diff options
| author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-05 22:20:58 +0000 |
|---|---|---|
| committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-05 22:20:58 +0000 |
| commit | 62f8c1994a1a3eb35fe0164a94d20033792486bc (patch) | |
| tree | c867ab479bb50260c9a87d1ecdaca049d7553de6 /webkit/glue/webclipboard_impl.cc | |
| parent | 996bc57c1de929e1476fa5d25b28127b5cb7c59e (diff) | |
| download | chromium_src-62f8c1994a1a3eb35fe0164a94d20033792486bc.zip chromium_src-62f8c1994a1a3eb35fe0164a94d20033792486bc.tar.gz chromium_src-62f8c1994a1a3eb35fe0164a94d20033792486bc.tar.bz2 | |
Revert 113040 - Enable custom MIME types in web copy/paste.
BUG=31037
TEST=manual testing
Review URL: http://codereview.chromium.org/8802004
TBR=dcheng@chromium.org
Review URL: http://codereview.chromium.org/8805030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113045 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webclipboard_impl.cc')
| -rw-r--r-- | webkit/glue/webclipboard_impl.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/webkit/glue/webclipboard_impl.cc b/webkit/glue/webclipboard_impl.cc index 000fea1..4f2dd99 100644 --- a/webkit/glue/webclipboard_impl.cc +++ b/webkit/glue/webclipboard_impl.cc @@ -5,7 +5,6 @@ #include "webkit/glue/webclipboard_impl.h" #include "base/logging.h" -#include "base/pickle.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "googleurl/src/gurl.h" @@ -19,9 +18,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" #include "ui/base/clipboard/clipboard.h" -#include "ui/base/clipboard/custom_data_helper.h" #include "webkit/glue/scoped_clipboard_writer_glue.h" -#include "webkit/glue/webdropdata.h" #include "webkit/glue/webkit_glue.h" #if WEBKIT_USING_CG @@ -246,13 +243,9 @@ void WebClipboardImpl::writeDataObject(const WebDragData& data) { // The same is true of the other WebClipboard::write* methods. ScopedClipboardWriterGlue scw(client_); - WebDropData data_object(data); // TODO(dcheng): Properly support text/uri-list here. - scw.WriteText(data_object.plain_text); - scw.WriteHTML(data_object.text_html, ""); - Pickle pickle; - ui::WriteCustomDataToPickle(data_object.custom_data, &pickle); - scw.WritePickledData(pickle, ui::Clipboard::GetWebCustomDataFormatType()); + scw.WriteText(data.plainText()); + scw.WriteHTML(data.htmlText(), ""); } bool WebClipboardImpl::ConvertBufferType(Buffer buffer, |