| 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 4a85487c169932904a11e2554d5bf065a90d7e31..9b623592616a6584ac6837c34692fcc781261a69 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"
|
|
|
| @@ -263,15 +264,17 @@ class MediaGalleriesGetMetadataFunction : public ChromeAsyncExtensionFunction {
|
|
|
| private:
|
| // Bottom half for RunImpl, 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_pictures,
|
| + 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_pictures,
|
| + 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, base::DictionaryValue* metadata_dictionary,
|
| + const std::vector<metadata::AttachedPicture>& attached_pictures);
|
| };
|
|
|
| } // namespace extensions
|
|
|