summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authordcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-15 00:36:25 +0000
committerdcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-15 00:36:25 +0000
commit5acde3de258048feb1bc9f9be1f558508a035a06 (patch)
treec39e4ab3a9bf36a38d954df9f284f321d4ddee56 /chrome
parent3f06bde64c34887bae7d3ed93ee92b999cc75769 (diff)
downloadchromium_src-5acde3de258048feb1bc9f9be1f558508a035a06.zip
chromium_src-5acde3de258048feb1bc9f9be1f558508a035a06.tar.gz
chromium_src-5acde3de258048feb1bc9f9be1f558508a035a06.tar.bz2
Add stubs and glue for routing a request for an image from the clipboard.
BUG=75237 TEST=none Review URL: http://codereview.chromium.org/6625075 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78134 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/common/clipboard_messages.h4
-rw-r--r--chrome/renderer/renderer_glue.cc15
2 files changed, 12 insertions, 7 deletions
diff --git a/chrome/common/clipboard_messages.h b/chrome/common/clipboard_messages.h
index 9bbce5b..7679c3f 100644
--- a/chrome/common/clipboard_messages.h
+++ b/chrome/common/clipboard_messages.h
@@ -7,7 +7,6 @@
#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"
@@ -42,6 +41,9 @@ 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 f61a011..4b31730 100644
--- a/chrome/renderer/renderer_glue.cc
+++ b/chrome/renderer/renderer_glue.cc
@@ -167,19 +167,22 @@ 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));
+ 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));
}
bool ClipboardReadAvailableTypes(ui::Clipboard::Buffer buffer,