chrome/browser/media_galleries/fileapi/supported_image_type_validator.cc - Issue 492873002: Collapse fileapi, webkit_blob, webkit_database, quota, and webkit_common namespaces into single sto…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/media_galleries/fileapi/supported_image_type_validator.cc

Issue 492873002: Collapse fileapi, webkit_blob, webkit_database, quota, and webkit_common namespaces into single sto… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix chromeos build Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/media_galleries/fileapi/supported_image_type_validator.h ('k') | chrome/browser/media_galleries/imported_media_gallery_registry.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media_galleries/fileapi/supported_image_type_validator.cc

diff --git a/chrome/browser/media_galleries/fileapi/supported_image_type_validator.cc b/chrome/browser/media_galleries/fileapi/supported_image_type_validator.cc

index 53ac37c8577c9554578b61a3b6aa099b6a06e951..f216570e8f2faf4c1087f9c3df49cef2af7b1ba2 100644

--- a/chrome/browser/media_galleries/fileapi/supported_image_type_validator.cc

+++ b/chrome/browser/media_galleries/fileapi/supported_image_type_validator.cc

@@ -51,9 +51,8 @@ class ImageDecoderDelegateAdapter : public ImageDecoder::Delegate {

public:

ImageDecoderDelegateAdapter(

scoped_ptr<std::string> data,

- const fileapi::CopyOrMoveFileValidator::ResultCallback& callback)

- : data_(data.Pass()),

- callback_(callback) {

+ const storage::CopyOrMoveFileValidator::ResultCallback& callback)

+ : data_(data.Pass()), callback_(callback) {

DCHECK(data_);

}

@@ -75,7 +74,7 @@ class ImageDecoderDelegateAdapter : public ImageDecoder::Delegate {

private:

scoped_ptr<std::string> data_;

- fileapi::CopyOrMoveFileValidator::ResultCallback callback_;

+ storage::CopyOrMoveFileValidator::ResultCallback callback_;

DISALLOW_COPY_AND_ASSIGN(ImageDecoderDelegateAdapter);

};