Only generate suggested filenames when actually dragging an image.

content/public/common/drop_data.h

 // Copyright 2013 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.
 
 // A struct for managing data being dropped on a WebContents.  This represents
 // a union of all the types of data that can be dropped in a platform neutral
 // way.
 
 #ifndef CONTENT_PUBLIC_COMMON_DROP_DATA_H_
 #define CONTENT_PUBLIC_COMMON_DROP_DATA_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <string>
 #include <vector>
 
+#include "base/files/file_path.h"
+#include "base/optional.h"
 #include "base/strings/nullable_string16.h"
 #include "content/common/content_export.h"
 #include "ipc/ipc_message.h"
 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
 #include "ui/base/dragdrop/file_info.h"
 #include "url/gurl.h"
 
 namespace content {
 
 struct CONTENT_EXPORT DropData {
@@ skipping 25 matching lines @@
     Kind kind;
     base::string16 mime_type;
     base::FilePath filename;
     GURL file_system_url;
   };
 
   DropData();
   DropData(const DropData& other);
   ~DropData();
 
+  // Returns a sanitized filename to use for the dragged image, or base::nullopt
+  // if no sanitized name could be synthesized.
+  base::Optional<base::FilePath> GetSafeFilenameForImageFileContents() const;
+
   int view_id = MSG_ROUTING_NONE;
 
   // Whether this drag originated from a renderer.
   bool did_originate_from_renderer;
 
-  // User is dragging a link into the webview.
+  // User is dragging a link or image.
   GURL url;
   base::string16 url_title;  // The title associated with |url|.
 
   // User is dragging a link out-of the webview.
   base::string16 download_metadata;
 
   // Referrer policy to use when dragging a link out of the webview results in
   // a download.
   blink::WebReferrerPolicy referrer_policy;
 
@@ skipping 12 matching lines @@
 
   // User is dragging plain text into the webview.
   base::NullableString16 text;
 
   // User is dragging text/html into the webview (e.g., out of Firefox).
   // |html_base_url| is the URL that the html fragment is taken from (used to
   // resolve relative links).  It's ok for |html_base_url| to be empty.
   base::NullableString16 html;
   GURL html_base_url;
 
-  // User is dragging data from the webview (e.g., an image).
-  base::string16 file_description_filename;
+  // User is dragging an image out of the WebView.
   std::string file_contents;
+  GURL file_contents_source_url;
+  base::FilePath::StringType file_contents_filename_extension;
+  std::string file_contents_content_disposition;
 
   std::map<base::string16, base::string16> custom_data;
 
   // The key-modifiers present for this update, included here so BrowserPlugin
   // can forward them to the guest renderer.
   // TODO(wjmaclean): This can probably be removed when BrowserPlugin goes
   // away, https://crbug.com/533069.
   int key_modifiers;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_DROP_DATA_H_