summaryrefslogtreecommitdiffstats
path: root/toolkit
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2020-02-28 18:00:45 -0500
committerMatt A. Tobin <email@mattatobin.com>2020-02-28 18:00:45 -0500
commit65b37410ca38005bd6f4c9470c93a49cd12ad368 (patch)
treec65f22f3ed2fda8b9b3ff36c029020bd1500d946 /toolkit
parent6a3d5769d01ec1a8dd56ea79aec2df91b801ce02 (diff)
downloadUXP-65b37410ca38005bd6f4c9470c93a49cd12ad368.tar
UXP-65b37410ca38005bd6f4c9470c93a49cd12ad368.tar.gz
UXP-65b37410ca38005bd6f4c9470c93a49cd12ad368.tar.lz
UXP-65b37410ca38005bd6f4c9470c93a49cd12ad368.tar.xz
UXP-65b37410ca38005bd6f4c9470c93a49cd12ad368.zip
Revert "Issue #190 - Part 1: Remove XP_IOS conditional code"
This reverts commit 6a3d5769d01ec1a8dd56ea79aec2df91b801ce02.
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/xre/UIKitDirProvider.h13
-rw-r--r--toolkit/xre/nsXREDirProvider.cpp11
2 files changed, 24 insertions, 0 deletions
diff --git a/toolkit/xre/UIKitDirProvider.h b/toolkit/xre/UIKitDirProvider.h
new file mode 100644
index 000000000..c74596125
--- /dev/null
+++ b/toolkit/xre/UIKitDirProvider.h
@@ -0,0 +1,13 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef TOOLKIT_XRE_UIKITDIRPROVIDER_H_
+#define TOOLKIT_XRE_UIKITDIRPROVIDER_H_
+
+#include "nsString.h"
+
+bool GetUIKitDirectory(bool aLocal, nsACString& aUserDir);
+
+#endif // TOOLKIT_XRE_UIKITDIRPROVIDER_H_
diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
index 158fe541b..151eb34e5 100644
--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp
@@ -58,6 +58,9 @@
#ifdef XP_UNIX
#include <ctype.h>
#endif
+#ifdef XP_IOS
+#include "UIKitDirProvider.h"
+#endif
#if defined(XP_MACOSX)
#define APP_REGISTRY_NAME "Application Registry"
@@ -1307,6 +1310,14 @@ nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, bool aLocal)
NS_ENSURE_SUCCESS(rv, rv);
localDir = do_QueryInterface(dirFileMac, &rv);
+#elif defined(XP_IOS)
+ nsAutoCString userDir;
+ if (GetUIKitDirectory(aLocal, userDir)) {
+ rv = NS_NewNativeLocalFile(userDir, true, getter_AddRefs(localDir));
+ } else {
+ rv = NS_ERROR_FAILURE;
+ }
+ NS_ENSURE_SUCCESS(rv, rv);
#elif defined(XP_WIN)
nsString path;
if (aLocal) {