Bug 785973 - Device Storage - On gaia, default to use /sdcard (not directories under /sdcard). r=djf

This commit is contained in:
Doug Turner 2012-08-30 15:17:39 -07:00
Родитель 0321648690
Коммит dfa0456722
1 изменённых файлов: 3 добавлений и 3 удалений

Просмотреть файл

@ -544,7 +544,7 @@ nsDOMDeviceStorage::SetRootDirectoryForType(const nsAString& aType)
// Picture directory // Picture directory
if (aType.Equals(NS_LITERAL_STRING("pictures"))) { if (aType.Equals(NS_LITERAL_STRING("pictures"))) {
#ifdef MOZ_WIDGET_GONK #ifdef MOZ_WIDGET_GONK
NS_NewLocalFile(NS_LITERAL_STRING("/sdcard/DCIM"), false, getter_AddRefs(f)); NS_NewLocalFile(NS_LITERAL_STRING("/sdcard"), false, getter_AddRefs(f));
#elif defined (MOZ_WIDGET_COCOA) #elif defined (MOZ_WIDGET_COCOA)
dirService->Get(NS_OSX_PICTURE_DOCUMENTS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f)); dirService->Get(NS_OSX_PICTURE_DOCUMENTS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
#elif defined (XP_UNIX) #elif defined (XP_UNIX)
@ -555,7 +555,7 @@ nsDOMDeviceStorage::SetRootDirectoryForType(const nsAString& aType)
// Video directory // Video directory
else if (aType.Equals(NS_LITERAL_STRING("videos"))) { else if (aType.Equals(NS_LITERAL_STRING("videos"))) {
#ifdef MOZ_WIDGET_GONK #ifdef MOZ_WIDGET_GONK
NS_NewLocalFile(NS_LITERAL_STRING("/sdcard/Movies"), false, getter_AddRefs(f)); NS_NewLocalFile(NS_LITERAL_STRING("/sdcard"), false, getter_AddRefs(f));
#elif defined (MOZ_WIDGET_COCOA) #elif defined (MOZ_WIDGET_COCOA)
dirService->Get(NS_OSX_MOVIE_DOCUMENTS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f)); dirService->Get(NS_OSX_MOVIE_DOCUMENTS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
#elif defined (XP_UNIX) #elif defined (XP_UNIX)
@ -566,7 +566,7 @@ nsDOMDeviceStorage::SetRootDirectoryForType(const nsAString& aType)
// Music directory // Music directory
else if (aType.Equals(NS_LITERAL_STRING("music"))) { else if (aType.Equals(NS_LITERAL_STRING("music"))) {
#ifdef MOZ_WIDGET_GONK #ifdef MOZ_WIDGET_GONK
NS_NewLocalFile(NS_LITERAL_STRING("/sdcard/Music"), false, getter_AddRefs(f)); NS_NewLocalFile(NS_LITERAL_STRING("/sdcard"), false, getter_AddRefs(f));
#elif defined (MOZ_WIDGET_COCOA) #elif defined (MOZ_WIDGET_COCOA)
dirService->Get(NS_OSX_MUSIC_DOCUMENTS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f)); dirService->Get(NS_OSX_MUSIC_DOCUMENTS_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f));
#elif defined (XP_UNIX) #elif defined (XP_UNIX)