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

extensions/browser/api/clipboard/clipboard_api.cc

Index: extensions/browser/api/clipboard/clipboard_api.cc
diff --git a/extensions/browser/api/clipboard/clipboard_api.cc b/extensions/browser/api/clipboard/clipboard_api.cc
index ef7373b821cc50d80cd1cfa1222657623846b78b..bd21c145e1776c94a78371cbe4cdb6fb194fafa4 100644
--- a/extensions/browser/api/clipboard/clipboard_api.cc
+++ b/extensions/browser/api/clipboard/clipboard_api.cc
@@ -8,6 +8,7 @@
 
 #include "base/lazy_instance.h"
 #include "base/memory/ptr_util.h"
+#include "base/strings/string_util.h"
 #include "base/values.h"
 #include "extensions/browser/api/extensions_api_client.h"
 #include "extensions/browser/event_router.h"
@@ -54,8 +55,17 @@ ExtensionFunction::ResponseAction ClipboardSetImageDataFunction::Run() {
   std::unique_ptr<clipboard::SetImageData::Params> params(
       clipboard::SetImageData::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
+
+  // Fill in the omitted additional data items with empty data.
+  if (!params->additional_items)
+    params->additional_items.reset(new AdditionalDataItemList());
+
+  if (!IsAdditionalItemsParamValid(*(params->additional_items))) {
+    return RespondNow(Error("Unsupported additionalItems parameter data."));
+  }
+
   ExtensionsAPIClient::Get()->SaveImageDataToClipboard(
-      params->image_data, params->type,
+      params->image_data, params->type, std::move(*(params->additional_items)),

[Devlin, 2017/05/23 17:04:47]

Won't this crash if additional_items is null?

[jennyz, 2017/05/23 21:36:39]

additional_items is filled in at line 61 if it is null.

       base::Bind(&ClipboardSetImageDataFunction::OnSaveImageDataSuccess, this),
       base::Bind(&ClipboardSetImageDataFunction::OnSaveImageDataError, this));
   return RespondLater();
@@ -70,4 +80,33 @@ void ClipboardSetImageDataFunction::OnSaveImageDataError(
   Respond(Error(error));
 }
 
+bool ClipboardSetImageDataFunction::IsAdditionalItemsParamValid(
+    const AdditionalDataItemList& items) {
+  // Limit the maximum text/html data length to 2MB.
+  const size_t max_item_data_bytes = 2097152;
+
+  bool has_text_plain = false;
+  bool has_text_html = false;
+  for (const clipboard::AdditionalDataItem& item : items) {
+    switch (item.type) {
+      case clipboard::DATA_ITEM_TYPE_TEXTPLAIN:
+        if (has_text_plain)
+          return false;
+        has_text_plain = true;
+        break;
+      case clipboard::DATA_ITEM_TYPE_TEXTHTML:
+        if (has_text_html)
+          return false;
+        has_text_html = true;
+        break;
+      default:
+        NOTREACHED();
+    }
+    // Check maximum length of the string data.
+    if (item.data.length() > max_item_data_bytes)
+      return false;
+  }
+  return true;
+}
+
 }  // namespace extensions