summaryrefslogtreecommitdiffstats
path: root/base/path_service.cc
diff options
context:
space:
mode:
authormichaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-21 22:34:50 +0000
committermichaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-21 22:34:50 +0000
commitf7d6997f6253e4c7645859757bc824c4164a9a7e (patch)
tree3183103533b527bb8b436aed5412b7bf00207e94 /base/path_service.cc
parent559c4e3eee40f9f3a127ba792a2ef0bcd217b543 (diff)
downloadchromium_src-f7d6997f6253e4c7645859757bc824c4164a9a7e.zip
chromium_src-f7d6997f6253e4c7645859757bc824c4164a9a7e.tar.gz
chromium_src-f7d6997f6253e4c7645859757bc824c4164a9a7e.tar.bz2
Upstream android file related code.
Implemented file related features BUG=None TEST=None Review URL: http://codereview.chromium.org/7184032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89914 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/path_service.cc')
-rw-r--r--base/path_service.cc18
1 files changed, 17 insertions, 1 deletions
diff --git a/base/path_service.cc b/base/path_service.cc
index e72ae7d..21eea9c 100644
--- a/base/path_service.cc
+++ b/base/path_service.cc
@@ -23,6 +23,8 @@ namespace base {
bool PathProviderWin(int key, FilePath* result);
#elif defined(OS_MACOSX)
bool PathProviderMac(int key, FilePath* result);
+#elif defined(OS_ANDROID)
+ bool PathProviderAndroid(int key, FilePath* result);
#elif defined(OS_POSIX)
bool PathProviderPosix(int key, FilePath* result);
#endif
@@ -78,7 +80,19 @@ static Provider base_provider_mac = {
};
#endif
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_ANDROID)
+static Provider base_provider_android = {
+ base::PathProviderAndroid,
+ &base_provider,
+#ifndef NDEBUG
+ 0,
+ 0,
+#endif
+ true
+};
+#endif
+
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
static Provider base_provider_posix = {
base::PathProviderPosix,
&base_provider,
@@ -102,6 +116,8 @@ struct PathData {
providers = &base_provider_win;
#elif defined(OS_MACOSX)
providers = &base_provider_mac;
+#elif defined(OS_ANDROID)
+ providers = &base_provider_android;
#elif defined(OS_POSIX)
providers = &base_provider_posix;
#endif