diff options
author | tommycli@chromium.org <tommycli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-15 09:55:38 +0000 |
---|---|---|
committer | tommycli@chromium.org <tommycli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-15 09:55:38 +0000 |
commit | 89b429341068c7b6d4c1129052e7abfc708d6161 (patch) | |
tree | 208aa003365726a6ae615da869b9ab19dc451c09 /chrome/browser/extensions/api | |
parent | 24e4cac9b53c6bebf0bafc40213ff67fa9caedb2 (diff) | |
download | chromium_src-89b429341068c7b6d4c1129052e7abfc708d6161.zip chromium_src-89b429341068c7b6d4c1129052e7abfc708d6161.tar.gz chromium_src-89b429341068c7b6d4c1129052e7abfc708d6161.tar.bz2 |
This is to allow extensions to determine the total length of Javascript blobs.
This cannot AFAIK be done via passing the length in a custom binding, as base::Value does not support int64 a.k.a. 'long long' types.
The total blob length is going to be used in media_galleries_api.cc to construct the SafeMediaMetadataParser in a followup CL. It appears unused in this patch.
BUG=
Review URL: https://codereview.chromium.org/129823003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244860 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/api')
4 files changed, 12 insertions, 6 deletions
diff --git a/chrome/browser/extensions/api/feedback_private/feedback_service.cc b/chrome/browser/extensions/api/feedback_private/feedback_service.cc index b66831f..f32840cc 100644 --- a/chrome/browser/extensions/api/feedback_private/feedback_service.cc +++ b/chrome/browser/extensions/api/feedback_private/feedback_service.cc @@ -66,7 +66,8 @@ void FeedbackService::SendFeedback( CompleteSendFeedback(); } -void FeedbackService::AttachedFileCallback(scoped_ptr<std::string> data) { +void FeedbackService::AttachedFileCallback(scoped_ptr<std::string> data, + int64 /* total_blob_length */) { if (!data.get()) feedback_data_->set_attached_file_uuid(std::string()); else @@ -75,7 +76,8 @@ void FeedbackService::AttachedFileCallback(scoped_ptr<std::string> data) { CompleteSendFeedback(); } -void FeedbackService::ScreenshotCallback(scoped_ptr<std::string> data) { +void FeedbackService::ScreenshotCallback(scoped_ptr<std::string> data, + int64 /* total_blob_length */) { if (!data.get()) feedback_data_->set_screenshot_uuid(std::string()); else diff --git a/chrome/browser/extensions/api/feedback_private/feedback_service.h b/chrome/browser/extensions/api/feedback_private/feedback_service.h index 9886149..3daff71 100644 --- a/chrome/browser/extensions/api/feedback_private/feedback_service.h +++ b/chrome/browser/extensions/api/feedback_private/feedback_service.h @@ -57,8 +57,10 @@ class FeedbackService { virtual base::WeakPtr<FeedbackService> GetWeakPtr() = 0; // Callbacks to receive blob data. - void AttachedFileCallback(scoped_ptr<std::string> data); - void ScreenshotCallback(scoped_ptr<std::string> data); + void AttachedFileCallback(scoped_ptr<std::string> data, + int64 total_blob_length); + void ScreenshotCallback(scoped_ptr<std::string> data, + int64 total_blob_length); // Checks if we have read all the blobs we need to; signals the feedback // data object once all the requisite data has been populated. diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc index 7d8a98f..0f12528 100644 --- a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc +++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc @@ -558,7 +558,8 @@ void MediaGalleriesGetMetadataFunction::OnPreferencesInit( } void MediaGalleriesGetMetadataFunction::SniffMimeType( - bool mime_type_only, scoped_ptr<std::string> blob_header) { + bool mime_type_only, scoped_ptr<std::string> blob_header, + int64 /* total_blob_length */) { DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); MediaGalleries::MediaMetadata metadata; 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 9918704..121eba1 100644 --- a/chrome/browser/extensions/api/media_galleries/media_galleries_api.h +++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api.h @@ -125,7 +125,8 @@ class MediaGalleriesGetMetadataFunction : public ChromeAsyncExtensionFunction { // Bottom half for RunImpl, invoked after the preferences is initialized. void OnPreferencesInit(bool mime_type_only, const std::string& blob_uuid); - void SniffMimeType(bool mime_type_only, scoped_ptr<std::string> blob_header); + void SniffMimeType(bool mime_type_only, scoped_ptr<std::string> blob_header, + int64 total_blob_length); }; } // namespace extensions |