Index: base/base_paths_android.cc |
=================================================================== |
--- base/base_paths_android.cc (revision 157679) |
+++ base/base_paths_android.cc (working copy) |
@@ -2,14 +2,12 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-// Defines base::PathProviderAndroid which replaces base::PathProviderPosix for |
-// Android in base/path_service.cc. |
+#include "base/base_paths.h" |
#include <unistd.h> |
#include "base/android/jni_android.h" |
#include "base/android/path_utils.h" |
-#include "base/base_paths.h" |
#include "base/file_path.h" |
#include "base/file_util.h" |
#include "base/logging.h" |
@@ -30,38 +28,42 @@ |
*result = FilePath(bin_dir); |
return true; |
} |
- case base::FILE_MODULE: |
+ case base::FILE_MODULE: { |
// dladdr didn't work in Android as only the file name was returned. |
NOTIMPLEMENTED(); |
return false; |
- case base::DIR_MODULE: |
+ } |
+ case base::DIR_MODULE: { |
*result = FilePath(base::android::GetNativeLibraryDirectory()); |
return true; |
- case base::DIR_SOURCE_ROOT: |
+ } |
+ case base::DIR_SOURCE_ROOT: { |
// This const is only used for tests. |
*result = FilePath(base::android::GetExternalStorageDirectory()); |
return true; |
- case base::DIR_USER_DESKTOP: |
- // Android doesn't support GetUserDesktop. |
- NOTIMPLEMENTED(); |
- return false; |
- case base::DIR_CACHE: |
+ } |
+ case base::DIR_CACHE: { |
*result = FilePath(base::android::GetCacheDirectory()); |
return true; |
- case base::DIR_ANDROID_APP_DATA: |
+ } |
+ case base::DIR_ANDROID_APP_DATA: { |
*result = FilePath(base::android::GetDataDirectory()); |
return true; |
- case base::DIR_HOME: |
+ } |
+ case base::DIR_HOME: { |
*result = file_util::GetHomeDir(); |
return true; |
- case base::DIR_ANDROID_EXTERNAL_STORAGE: |
+ } |
+ case base::DIR_ANDROID_EXTERNAL_STORAGE: { |
*result = FilePath(base::android::GetExternalStorageDirectory()); |
return true; |
- default: |
+ } |
+ default: { |
// Note: the path system expects this function to override the default |
// behavior. So no need to log an error if we don't support a given |
// path. The system will just use the default. |
return false; |
+ } |
} |
} |