Index: base/base_paths_mac.mm |
=================================================================== |
--- base/base_paths_mac.mm (revision 157679) |
+++ base/base_paths_mac.mm (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::PathProviderMac which replaces base::PathProviderPosix for Mac |
-// in base/path_service.cc. |
+#include "base/base_paths_mac.h" |
#include <dlfcn.h> |
#import <Foundation/Foundation.h> |
#include <mach-o/dyld.h> |
-#include "base/base_paths.h" |
#include "base/compiler_specific.h" |
#include "base/file_path.h" |
#include "base/file_util.h" |
@@ -17,7 +15,6 @@ |
#include "base/mac/foundation_util.h" |
#include "base/path_service.h" |
#include "base/string_util.h" |
-#include "build/build_config.h" |
namespace { |
@@ -60,6 +57,8 @@ |
case base::FILE_MODULE: |
return GetModulePathForAddress(result, |
reinterpret_cast<const void*>(&base::PathProviderMac)); |
+ case base::DIR_CACHE: |
+ return base::mac::GetUserDirectory(NSCachesDirectory, result); |
case base::DIR_APP_DATA: { |
bool success = base::mac::GetUserDirectory(NSApplicationSupportDirectory, |
result); |
@@ -70,7 +69,7 @@ |
#endif // defined(OS_IOS) |
return success; |
} |
- case base::DIR_SOURCE_ROOT: |
+ case base::DIR_SOURCE_ROOT: { |
// Go through PathService to catch overrides. |
if (!PathService::Get(base::FILE_EXE, result)) |
return false; |
@@ -91,13 +90,11 @@ |
} |
#endif |
return true; |
- case base::DIR_USER_DESKTOP: |
- return base::mac::GetUserDirectory(NSDesktopDirectory, result); |
- case base::DIR_CACHE: |
- return base::mac::GetUserDirectory(NSCachesDirectory, result); |
- case base::DIR_HOME: |
+ } |
+ case base::DIR_HOME: { |
*result = base::mac::NSStringToFilePath(NSHomeDirectory()); |
return true; |
+ } |
default: |
return false; |
} |
Property changes on: base/base_paths_mac.mm |
___________________________________________________________________ |
Deleted: svn:mergeinfo |