Rewrote the clipboard API to be more concurrent. Added a helper class to make...

chrome/browser/resource_message_filter.h

Index: chrome/browser/resource_message_filter.h
===================================================================
--- chrome/browser/resource_message_filter.h	(revision 4189)
+++ chrome/browser/resource_message_filter.h	(working copy)
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_RENDERER_RESOURCE_MSG_FILTER_H__
 #define CHROME_BROWSER_RENDERER_RESOURCE_MSG_FILTER_H__
 
+#include "base/clipboard.h"
 #include "base/gfx/rect.h"
 #include "base/ref_counted.h"
 #include "chrome/browser/resource_dispatcher_host.h"
@@ -115,9 +116,7 @@
   void OnDnsPrefetch(const std::vector<std::string>& hostnames);
   void OnReceiveContextMenuMsg(const IPC::Message& msg);
   // Clipboard messages
-  void OnClipboardWriteHTML(const std::wstring& markup, const GURL& src_url);
-  void OnClipboardWriteBookmark(const std::wstring& title, const GURL& url);
-  void OnClipboardWriteBitmap(SharedMemoryHandle bitmap, gfx::Size size);
+  void OnClipboardWriteObjects(const Clipboard::ObjectMap& objects);
   void OnClipboardIsFormatAvailable(unsigned int format, bool* result);
   void OnClipboardReadText(std::wstring* result);
   void OnClipboardReadAsciiText(std::string* result);