chrome/browser/media_galleries/imported_media_gallery_registry.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/imported_media_gallery_registry.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.cc ('k') | chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media_galleries/imported_media_gallery_registry.cc

diff --git a/chrome/browser/media_galleries/imported_media_gallery_registry.cc b/chrome/browser/media_galleries/imported_media_gallery_registry.cc

index 5acc6b25b5d9da867edaa8a4fa2d280ed1f6d4d5..a1c6cf4717011b76c960dc1c6ac259fc7b486969 100644

--- a/chrome/browser/media_galleries/imported_media_gallery_registry.cc

+++ b/chrome/browser/media_galleries/imported_media_gallery_registry.cc

@@ -17,7 +17,7 @@

#include "webkit/common/fileapi/file_system_mount_option.h"

using base::Bind;

-using fileapi::ExternalMountPoints;

+using storage::ExternalMountPoints;

namespace {

@@ -55,7 +55,9 @@ bool ImportedMediaGalleryRegistry::RegisterPicasaFilesystemOnUIThread(

if (root.empty())

return false;

result = ExternalMountPoints::GetSystemInstance()->RegisterFileSystem(

- fs_name, fileapi::kFileSystemTypePicasa, fileapi::FileSystemMountOption(),

+ fs_name,

+ storage::kFileSystemTypePicasa,

+ storage::FileSystemMountOption(),

root.AppendASCII("picasa"));

if (!result)

return result;

@@ -90,7 +92,9 @@ bool ImportedMediaGalleryRegistry::RegisterITunesFilesystemOnUIThread(

if (root.empty())

return false;

result = ExternalMountPoints::GetSystemInstance()->RegisterFileSystem(

- fs_name, fileapi::kFileSystemTypeItunes, fileapi::FileSystemMountOption(),

+ fs_name,

+ storage::kFileSystemTypeItunes,

+ storage::FileSystemMountOption(),

root.AppendASCII("itunes"));

if (!result)

return result;

@@ -127,7 +131,9 @@ bool ImportedMediaGalleryRegistry::RegisterIPhotoFilesystemOnUIThread(

if (root.empty())

return false;

result = ExternalMountPoints::GetSystemInstance()->RegisterFileSystem(

- fs_name, fileapi::kFileSystemTypeIphoto, fileapi::FileSystemMountOption(),

+ fs_name,

+ storage::kFileSystemTypeIphoto,

+ storage::FileSystemMountOption(),

root.AppendASCII("iphoto"));

if (!result)

return result;