| Index: chrome/browser/media_galleries/fileapi/safe_media_metadata_parser.h
|
| diff --git a/chrome/browser/media_galleries/fileapi/safe_media_metadata_parser.h b/chrome/browser/media_galleries/fileapi/safe_media_metadata_parser.h
|
| index c5022fea78a7a3ebf372afa0c6e963f9d65e2228..12995f45041821b2e698174cdcce73f9a0dc1dd1 100644
|
| --- a/chrome/browser/media_galleries/fileapi/safe_media_metadata_parser.h
|
| +++ b/chrome/browser/media_galleries/fileapi/safe_media_metadata_parser.h
|
| @@ -5,6 +5,9 @@
|
| #ifndef CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_SAFE_MEDIA_METADATA_PARSER_H_
|
| #define CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_SAFE_MEDIA_METADATA_PARSER_H_
|
|
|
| +#include <string>
|
| +#include <vector>
|
| +
|
| #include "base/callback.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/scoped_ptr.h"
|
| @@ -29,11 +32,14 @@ class SafeMediaMetadataParser : public content::UtilityProcessHostClient {
|
| public:
|
| // |metadata_dictionary| is owned by the callback.
|
| typedef base::Callback<
|
| - void(bool parse_success, base::DictionaryValue* metadata_dictionary)>
|
| + void(bool parse_success, base::DictionaryValue* metadata_dictionary,
|
| + const std::vector<std::string>& attached_pictures_bytes,
|
| + const std::vector<std::string>& attached_pictures_types)>
|
| DoneCallback;
|
|
|
| SafeMediaMetadataParser(Profile* profile, const std::string& blob_uuid,
|
| - int64 blob_size, const std::string& mime_type);
|
| + int64 blob_size, const std::string& mime_type,
|
| + bool get_attached_pictures);
|
|
|
| // Should be called on the UI thread. |callback| also runs on the UI thread.
|
| void Start(const DoneCallback& callback);
|
| @@ -54,8 +60,9 @@ class SafeMediaMetadataParser : public content::UtilityProcessHostClient {
|
| // Notification from the utility process when it finishes parsing metadata.
|
| // Runs on the IO thread.
|
| void OnParseMediaMetadataFinished(
|
| - bool parse_success,
|
| - const base::DictionaryValue& metadata_dictionary);
|
| + bool parse_success, const base::DictionaryValue& metadata_dictionary,
|
| + const std::vector<std::string>& attached_pictures_bytes,
|
| + const std::vector<std::string>& attached_pictures_types);
|
|
|
| // Sequence of functions that bounces from the IO thread to the UI thread to
|
| // read the blob data, then sends the data back to the utility process.
|
| @@ -78,6 +85,7 @@ class SafeMediaMetadataParser : public content::UtilityProcessHostClient {
|
| const std::string blob_uuid_;
|
| const int64 blob_size_;
|
| const std::string mime_type_;
|
| + bool get_attached_pictures_;
|
|
|
| DoneCallback callback_;
|
|
|
|
|