diff options
| author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 01:13:54 +0000 |
|---|---|---|
| committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 01:13:54 +0000 |
| commit | 6a90d5c514d82080a8d15265094e10e1a79a3c55 (patch) | |
| tree | e185002a465b75abd38965311f2f98f33deaf63d /chrome | |
| parent | d4de021797b34583cdf72983cdbf653fe4d290fe (diff) | |
| download | chromium_src-6a90d5c514d82080a8d15265094e10e1a79a3c55.zip chromium_src-6a90d5c514d82080a8d15265094e10e1a79a3c55.tar.gz chromium_src-6a90d5c514d82080a8d15265094e10e1a79a3c55.tar.bz2 | |
Revert r78134+r78136
BUG=none
TEST=none
TBR=levin@chromium.org
Review URL: http://codereview.chromium.org/6698011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78139 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/common/clipboard_messages.h | 4 | ||||
| -rw-r--r-- | chrome/renderer/renderer_glue.cc | 15 |
2 files changed, 7 insertions, 12 deletions
diff --git a/chrome/common/clipboard_messages.h b/chrome/common/clipboard_messages.h index 7679c3f..9bbce5b 100644 --- a/chrome/common/clipboard_messages.h +++ b/chrome/common/clipboard_messages.h @@ -7,6 +7,7 @@ #include <string> #include <vector> +// #include "chrome/common/common_param_traits.h" #include "content/common/common_param_traits.h" #include "ipc/ipc_message_macros.h" #include "ipc/ipc_param_traits.h" @@ -41,9 +42,6 @@ IPC_SYNC_MESSAGE_CONTROL1_2(ClipboardHostMsg_ReadHTML, ui::Clipboard::Buffer /* buffer */, string16 /* markup */, GURL /* url */) -IPC_SYNC_MESSAGE_CONTROL1_1(ClipboardHostMsg_ReadImage, - ui::Clipboard::Buffer /* buffer */, - std::string /* PNG-encoded image */) #if defined(OS_MACOSX) IPC_MESSAGE_CONTROL1(ClipboardHostMsg_FindPboardWriteStringAsync, string16 /* text */) diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc index 4b31730..f61a011 100644 --- a/chrome/renderer/renderer_glue.cc +++ b/chrome/renderer/renderer_glue.cc @@ -167,22 +167,19 @@ bool ClipboardIsFormatAvailable(const ui::Clipboard::FormatType& format, } void ClipboardReadText(ui::Clipboard::Buffer buffer, string16* result) { - RenderThread::current()->Send(new ClipboardHostMsg_ReadText(buffer, result)); + RenderThread::current()->Send(new ClipboardHostMsg_ReadText(buffer, + result)); } void ClipboardReadAsciiText(ui::Clipboard::Buffer buffer, std::string* result) { - RenderThread::current()->Send( - new ClipboardHostMsg_ReadAsciiText(buffer, result)); + RenderThread::current()->Send(new ClipboardHostMsg_ReadAsciiText(buffer, + result)); } void ClipboardReadHTML(ui::Clipboard::Buffer buffer, string16* markup, GURL* url) { - RenderThread::current()->Send( - new ClipboardHostMsg_ReadHTML(buffer, markup, url)); -} - -void ClipboardReadImage(ui::Clipboard::Buffer buffer, std::string* data) { - RenderThread::current()->Send(new ClipboardHostMsg_ReadImage(buffer, data)); + RenderThread::current()->Send(new ClipboardHostMsg_ReadHTML(buffer, + markup, url)); } bool ClipboardReadAvailableTypes(ui::Clipboard::Buffer buffer, |