| Index: chrome/utility/media_galleries/media_metadata_parser.h
|
| diff --git a/chrome/utility/media_galleries/media_metadata_parser.h b/chrome/utility/media_galleries/media_metadata_parser.h
|
| index 980c07a58c1c8df81891b860da8d746aa9a5c285..97748800a28df1ca523f3235b1e685ace3ddeb08 100644
|
| --- a/chrome/utility/media_galleries/media_metadata_parser.h
|
| +++ b/chrome/utility/media_galleries/media_metadata_parser.h
|
| @@ -5,6 +5,9 @@
|
| #ifndef CHROME_UTILITY_MEDIA_GALLERIES_MEDIA_METADATA_PARSER_H_
|
| #define CHROME_UTILITY_MEDIA_GALLERIES_MEDIA_METADATA_PARSER_H_
|
|
|
| +#include <string>
|
| +#include <vector>
|
| +
|
| #include "base/callback.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "chrome/common/extensions/api/media_galleries.h"
|
| @@ -27,11 +30,16 @@ namespace metadata {
|
| class MediaMetadataParser {
|
| public:
|
| typedef extensions::api::media_galleries::MediaMetadata MediaMetadata;
|
| - typedef base::Callback<void(scoped_ptr<MediaMetadata>)> MetadataCallback;
|
| + typedef base::Callback<
|
| + void(scoped_ptr<MediaMetadata> metadata,
|
| + const std::vector<std::string>& attached_pictures_bytes,
|
| + const std::vector<std::string>& attached_pictures_types)>
|
| + MetadataCallback;
|
|
|
| // Does not take ownership of |source|. Caller is responsible for ensuring
|
| // that |source| outlives this object.
|
| - MediaMetadataParser(media::DataSource* source, const std::string& mime_type);
|
| + MediaMetadataParser(media::DataSource* source, const std::string& mime_type,
|
| + bool get_attached_pictures);
|
|
|
| ~MediaMetadataParser();
|
|
|
| @@ -44,6 +52,8 @@ class MediaMetadataParser {
|
|
|
| const std::string mime_type_;
|
|
|
| + bool get_attached_pictures_;
|
| +
|
| // Thread that blocking media parsing operations run on while the main thread
|
| // handles messages from the browser process.
|
| // TODO(tommycli): Replace with a reference to a WorkerPool if we ever use
|
|
|