Have ScopedClipboardWriter and Clipboard::WriteObjects take a buffer parameter.

ui/base/clipboard/scoped_clipboard_writer.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file declares the ScopedClipboardWriter class, a wrapper around
 // the Clipboard class which simplifies writing data to the system clipboard.
 // Upon deletion the class atomically writes all data to |clipboard_|,
 // avoiding any potential race condition with other processes that are also
 // writing to the system clipboard.
 
@@ skipping 11 matching lines @@
 
 namespace ui {
 
 // This class is a wrapper for |Clipboard| that handles packing data
 // into a Clipboard::ObjectMap.
 // NB: You should probably NOT be using this class if you include
 // webkit_glue.h. Use ScopedClipboardWriterGlue instead.
 class UI_EXPORT ScopedClipboardWriter {
  public:
   // Create an instance that is a simple wrapper around clipboard.
-  explicit ScopedClipboardWriter(Clipboard* clipboard);
+  explicit ScopedClipboardWriter(Clipboard* clipboard,

[sky, 2012/02/16 01:39:03]

no explicit

[peter1, 2012/02/17 18:45:41]

Done.

+                                 Clipboard::Buffer buffer);
 
   ~ScopedClipboardWriter();
 
   // Converts |text| to UTF-8 and adds it to the clipboard.
   void WriteText(const string16& text);
 
   // Converts the text of the URL to UTF-8 and adds it to the clipboard, then
   // notifies the Clipboard that we just wrote a URL.
   void WriteURL(const string16& text);
 
@@ skipping 22 matching lines @@
 
  protected:
   // Converts |text| to UTF-8 and adds it to the clipboard.  If it's a URL, we
   // also notify the clipboard of that fact.
   void WriteTextOrURL(const string16& text, bool is_url);
 
   // We accumulate the data passed to the various targets in the |objects_|
   // vector, and pass it to Clipboard::WriteObjects() during object destruction.
   Clipboard::ObjectMap objects_;
   Clipboard* clipboard_;
+  Clipboard::Buffer buffer_;
 
   // We keep around the UTF-8 text of the URL in order to pass it to
   // Clipboard::DidWriteURL().
   std::string url_text_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScopedClipboardWriter);
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_CLIPBOARD_SCOPED_CLIPBOARD_WRITER_H_