Add WebDragData to blink::WebView::dragtargetDrop

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_
@@ skipping 14 matching lines @@
 
 struct CONTENT_EXPORT DropData {
   struct FileSystemFileInfo {
     FileSystemFileInfo() : size(0) {}
     ~FileSystemFileInfo() {}
 
     GURL url;
     int64_t size;
   };
 
+  enum class Kind {
+    STRING = 0,
+    FILENAME,
+    FILESYSTEMFILE,
+    LAST = FILESYSTEMFILE
+  };
+
+  struct MetaData {
+    MetaData();
+    MetaData(DropData::Kind kind, base::string16 mime_type);

[dcheng, 2016/05/10 07:29:09]

const base::string16, here and below.

[hush (inactive), 2016/05/10 21:18:32]

Done. 

+    MetaData(DropData::Kind kind, base::FilePath filename);
+    MetaData(DropData::Kind kind, GURL file_system_url);
+    MetaData(const MetaData& other);
+    ~MetaData() {}

[dcheng, 2016/05/10 07:29:09]

I'm surprised that clang's complex destructor check isn't firing here.

[hush (inactive), 2016/05/10 21:18:32]

Clang may have just missed it.
I moved the destructor to cc file.

+
+    DropData::Kind kind;
+    base::string16 mime_type;
+    base::FilePath filename;
+    GURL file_system_url;
+  };
+
   DropData();
   DropData(const DropData& other);
   ~DropData();
 
   // Whether this drag originated from a renderer.
   bool did_originate_from_renderer;
 
   // User is dragging a link into the webview.
   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;
 
   // User is dropping one or more files on the webview. This field is only
   // populated if the drag is not renderer tainted, as this allows File access
   // from web content.
   std::vector<ui::FileInfo> filenames;
+  // The mime types of dragged files.
+  std::vector<base::string16> file_mime_types;
 
   // Isolated filesystem ID for the files being dragged on the webview.
   base::string16 filesystem_id;
 
   // User is dragging files specified with filesystem: URLs.
   std::vector<FileSystemFileInfo> file_system_files;
 
   // 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;
   std::string file_contents;
 
   std::map<base::string16, base::string16> custom_data;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_DROP_DATA_H_