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

Unified Diff: content/browser/renderer_host/clipboard_message_filter.cc

Issue 6685063: Fix glue for ClipboardHostMsg_ReadAvailableTypes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 9 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.h ('k') | ui/base/clipboard/clipboard.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/clipboard_message_filter.cc
diff --git a/content/browser/renderer_host/clipboard_message_filter.cc b/content/browser/renderer_host/clipboard_message_filter.cc
index ca71e5dcb6cd956745547e653b4e1a139e0c4add..741d4354bc4bf4c8b44436b6a3624cf8dcc78ddf 100644
--- a/content/browser/renderer_host/clipboard_message_filter.cc
+++ b/content/browser/renderer_host/clipboard_message_filter.cc
@@ -52,6 +52,8 @@ bool ClipboardMessageFilter::OnMessageReceived(const IPC::Message& message,
IPC_MESSAGE_HANDLER(ClipboardHostMsg_WriteObjectsAsync, OnWriteObjectsAsync)
IPC_MESSAGE_HANDLER(ClipboardHostMsg_WriteObjectsSync, OnWriteObjectsSync)
IPC_MESSAGE_HANDLER(ClipboardHostMsg_IsFormatAvailable, OnIsFormatAvailable)
+ IPC_MESSAGE_HANDLER(ClipboardHostMsg_ReadAvailableTypes,
+ OnReadAvailableTypes)
IPC_MESSAGE_HANDLER(ClipboardHostMsg_ReadText, OnReadText)
IPC_MESSAGE_HANDLER(ClipboardHostMsg_ReadAsciiText, OnReadAsciiText)
IPC_MESSAGE_HANDLER(ClipboardHostMsg_ReadHTML, OnReadHTML)
@@ -60,8 +62,6 @@ bool ClipboardMessageFilter::OnMessageReceived(const IPC::Message& message,
IPC_MESSAGE_HANDLER(ClipboardHostMsg_FindPboardWriteStringAsync,
OnFindPboardWriteString)
#endif
- IPC_MESSAGE_HANDLER(ClipboardHostMsg_ReadAvailableTypes,
- OnReadAvailableTypes)
IPC_MESSAGE_HANDLER(ClipboardHostMsg_ReadData, OnReadData)
IPC_MESSAGE_HANDLER(ClipboardHostMsg_ReadFilenames, OnReadFilenames)
IPC_MESSAGE_UNHANDLED(handled = false)
@@ -141,11 +141,9 @@ void ClipboardMessageFilter::OnReadImage(
}
void ClipboardMessageFilter::OnReadAvailableTypes(
- ui::Clipboard::Buffer buffer, bool* succeeded, std::vector<string16>* types,
+ ui::Clipboard::Buffer buffer, std::vector<string16>* types,
bool* contains_filenames) {
- *contains_filenames = false;
- *succeeded = ClipboardDispatcher::ReadAvailableTypes(
- buffer, types, contains_filenames);
+ GetClipboard()->ReadAvailableTypes(buffer, types, contains_filenames);
}
void ClipboardMessageFilter::OnReadData(
« no previous file with comments | « content/browser/renderer_host/clipboard_message_filter.h ('k') | ui/base/clipboard/clipboard.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698