Media Galleries API: Audio/Video attached pictures support.

chrome/browser/extensions/api/media_galleries/media_galleries_api.h

Index: chrome/browser/extensions/api/media_galleries/media_galleries_api.h
diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_api.h b/chrome/browser/extensions/api/media_galleries/media_galleries_api.h
index 94762c4a10bf02ad3dbbdc9ccdbc749def0defbb..f21dc2a501e38e1a959ffef42f057d8af88e6a4b 100644
--- a/chrome/browser/extensions/api/media_galleries/media_galleries_api.h
+++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api.h
@@ -18,6 +18,7 @@
 #include "chrome/browser/media_galleries/media_file_system_registry.h"
 #include "chrome/browser/media_galleries/media_scan_manager_observer.h"
 #include "chrome/common/extensions/api/media_galleries.h"
+#include "chrome/common/media_galleries/metadata_types.h"
 #include "components/storage_monitor/media_storage_util.h"
 #include "extensions/browser/browser_context_keyed_api_factory.h"
 
@@ -33,6 +34,10 @@ namespace metadata {
 class SafeMediaMetadataParser;
 }
 
+namespace webkit_blob {
+class BlobDataHandle;
+}
+
 namespace extensions {
 
 class Extension;
@@ -263,15 +268,28 @@ class MediaGalleriesGetMetadataFunction : public ChromeAsyncExtensionFunction {
 
  private:
   // Bottom half for RunAsync, invoked after the preferences is initialized.
-  void OnPreferencesInit(bool mime_type_only, const std::string& blob_uuid);
+  void OnPreferencesInit(bool mime_type_only, bool get_attached_images,
+                         const std::string& blob_uuid);
 
-  void SniffMimeType(bool mime_type_only,
-                     const std::string& blob_uuid,
-                     scoped_ptr<std::string> blob_header,
-                     int64 total_blob_length);
+  void GetMetadata(bool mime_type_only, bool get_attached_images,
+                   const std::string& blob_uuid,
+                   scoped_ptr<std::string> blob_header,
+                   int64 total_blob_length);
 
   void OnSafeMediaMetadataParserDone(
-      bool parse_success, base::DictionaryValue* metadata_dictionary);
+      bool parse_success, scoped_ptr<base::DictionaryValue> metadata_dictionary,
+      scoped_ptr<std::vector<metadata::AttachedImage>> attached_images);
+
+  void ConstructNextBlob(
+      scoped_ptr<base::DictionaryValue> metadata_dictionary,
+      scoped_ptr<std::vector<metadata::AttachedImage>> attached_images,
+      scoped_ptr<std::vector<std::string>> blob_uuids,
+      scoped_ptr<webkit_blob::BlobDataHandle> next_blob);
+
+  void FinishRequest(
+      scoped_ptr<base::DictionaryValue> metadata_dictionary,
+      scoped_ptr<std::vector<metadata::AttachedImage>> attached_images,
+      scoped_ptr<std::vector<std::string>> blob_uuids);
 };
 
 }  // namespace extensions