Modify SetImageData to add additional items along with image data to save on clipboard.

chrome/browser/extensions/clipboard_extension_helper_chromeos.cc

 // Copyright 2016 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.
 
 #include "chrome/browser/extensions/clipboard_extension_helper_chromeos.h"
 
 #include "base/callback_helpers.h"
 #include "base/macros.h"
 #include "base/metrics/histogram_macros.h"
+#include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/cancellation_flag.h"
 #include "chrome/browser/image_decoder.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 
 using content::BrowserThread;
 
 namespace extensions {
 
 namespace clipboard = api::clipboard;
@@ skipping 54 matching lines @@
 
 ClipboardExtensionHelper::ClipboardExtensionHelper() {
   clipboard_image_data_decoder_.reset(new ClipboardImageDataDecoder(this));
 }
 
 ClipboardExtensionHelper::~ClipboardExtensionHelper() {}
 
 void ClipboardExtensionHelper::DecodeAndSaveImageData(
     const std::vector<char>& data,
     clipboard::ImageType type,
+    std::unique_ptr<AdditionalDataItemList> additional_items,
     const base::Closure& success_callback,
     const base::Callback<void(const std::string&)>& error_callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // If there is a previous image decoding request still running, cancel it
   // first. We only need the most recent image save request be completed, since
   // the clipboard will only store data set by the most recent request, which
   // is consistent with the clipboard "paste" behavior.
   if (clipboard_image_data_decoder_->has_request_pending())
     clipboard_image_data_decoder_->Cancel();
 
+  // Cache additonal items if they are available.
+  if (additional_items) {
+    additonal_items_.clear();
+    for (const clipboard::AdditionalDataItem& item : *additional_items) {
+      clipboard::AdditionalDataItem data_item;
+      data_item.type = item.type;
+      data_item.data = item.data;
+      additonal_items_.push_back(std::move(data_item));

[Devlin, 2017/05/17 16:08:43]

If we're just going to move all of these anyway, why not just pass the vector by
value and move it in?  Unless we want to allow null, in which case we should
just use swap().

[jennyz, 2017/05/18 23:33:48]

Done.

+    }
+  }
+
   image_save_success_callback_ = success_callback;
   image_save_error_callback_ = error_callback;
   clipboard_image_data_decoder_->Start(data, type);
 }
 
 void ClipboardExtensionHelper::OnImageDecodeFailure() {
   base::ResetAndReturn(&image_save_error_callback_)
-      .Run("Image data decoding failed");
+      .Run("Image data decoding failed.");
 }
 
 void ClipboardExtensionHelper::OnImageDecoded(const SkBitmap& bitmap) {
   {
     ui::ScopedClipboardWriter scw(ui::CLIPBOARD_TYPE_COPY_PASTE);
     // Write the decoded image data to clipboard.
     if (!bitmap.empty() && !bitmap.isNull())
       scw.WriteImage(bitmap);
+
+    for (const clipboard::AdditionalDataItem& item : additonal_items_) {
+      if (item.type == clipboard::DATA_ITEM_TYPE_TEXT_PLAIN)
+        scw.WriteText(base::UTF8ToUTF16(item.data));
+      else if (item.type == clipboard::DATA_ITEM_TYPE_TEXT_HTML)
+        scw.WriteHTML(base::UTF8ToUTF16(item.data), std::string());
+    }
   }
   base::ResetAndReturn(&image_save_success_callback_).Run();
 }
 
 void ClipboardExtensionHelper::OnImageDecodeCancel() {
-  base::ResetAndReturn(&image_save_error_callback_).Run("Request canceled");
+  base::ResetAndReturn(&image_save_error_callback_).Run("Request canceled.");
 }
 
 }  // namespace extensions