From 288a4898ddb762ae838c07fe9a329a3848e77202 Mon Sep 17 00:00:00 2001 From: Doug Turner Date: Fri, 14 Sep 2012 09:39:44 -0700 Subject: [PATCH] Backing out 7653a9cc00ae. Shouldn't have been checked in. r=me --- dom/devicestorage/nsDeviceStorage.cpp | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/dom/devicestorage/nsDeviceStorage.cpp b/dom/devicestorage/nsDeviceStorage.cpp index e65872f80d7..2141318b7b7 100644 --- a/dom/devicestorage/nsDeviceStorage.cpp +++ b/dom/devicestorage/nsDeviceStorage.cpp @@ -612,7 +612,7 @@ nsDOMDeviceStorage::SetRootDirectoryForType(const nsAString& aType) NS_ASSERTION(dirService, "Must have directory service"); // Picture directory - if (aType.EqualsLiteral(DEVICESTORAGE_PICTURES)) { + if (aType.Equals(NS_LITERAL_STRING("pictures"))) { #ifdef MOZ_WIDGET_GONK NS_NewLocalFile(NS_LITERAL_STRING("/sdcard"), false, getter_AddRefs(f)); #elif defined (MOZ_WIDGET_COCOA) @@ -625,7 +625,7 @@ nsDOMDeviceStorage::SetRootDirectoryForType(const nsAString& aType) } // Video directory - else if (aType.EqualsLiteral(DEVICESTORAGE_VIDEOS)) { + else if (aType.Equals(NS_LITERAL_STRING("videos"))) { #ifdef MOZ_WIDGET_GONK NS_NewLocalFile(NS_LITERAL_STRING("/sdcard"), false, getter_AddRefs(f)); #elif defined (MOZ_WIDGET_COCOA) @@ -638,7 +638,7 @@ nsDOMDeviceStorage::SetRootDirectoryForType(const nsAString& aType) } // Music directory - else if (aType.EqualsLiteral(DEVICESTORAGE_MUSIC)) { + else if (aType.Equals(NS_LITERAL_STRING("music"))) { #ifdef MOZ_WIDGET_GONK NS_NewLocalFile(NS_LITERAL_STRING("/sdcard"), false, getter_AddRefs(f)); #elif defined (MOZ_WIDGET_COCOA) @@ -649,15 +649,6 @@ nsDOMDeviceStorage::SetRootDirectoryForType(const nsAString& aType) dirService->Get(NS_WIN_MUSIC_DIR, NS_GET_IID(nsIFile), getter_AddRefs(f)); #endif } - - // Apps directory - else if (aType.EqualsLiteral(DEVICESTORAGE_APPS)) { -#ifdef MOZ_WIDGET_GONK - NS_NewLocalFile(NS_LITERAL_STRING("/data"), false, getter_AddRefs(f)); -#else - // where do we store 3rd party applications on the desktop? -#endif - } // in testing, we default all device storage types to a temp directory if (f && mozilla::Preferences::GetBool("device.storage.testing", false)) {