Chromium Code Reviews| Index: base/base_paths_mac.mm |
| diff --git a/base/base_paths_mac.mm b/base/base_paths_mac.mm |
| index 14d1c201ca765d35bca7ce8ba87e1fda32e394b7..0d12e1ab5aae7ca5a678282fb78b5af21fad923f 100644 |
| --- a/base/base_paths_mac.mm |
| +++ b/base/base_paths_mac.mm |
| @@ -2,12 +2,14 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#include "base/base_paths_mac.h" |
| +// Defines base::PathProviderMac which replaces base::PathProviderPosix for |
| +// OS_MAXOSX in base/path_service.cc. |
| #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" |
| @@ -57,8 +59,6 @@ bool PathProviderMac(int key, FilePath* result) { |
| 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); |
| @@ -91,6 +91,11 @@ bool PathProviderMac(int key, FilePath* result) { |
| #endif |
| return true; |
| } |
| + case base::DIR_USER_DESKTOP: { |
| + return base::mac::GetUserDirectory(NSDesktopDirectory, result); |
| + } |
| + case base::DIR_CACHE: |
|
brettw
2012/09/14 22:10:06
I'd use {} here to be more in-line with the surrou
gab
2012/09/16 03:13:51
Done (and made the file uniformly respect this syn
|
| + return base::mac::GetUserDirectory(NSCachesDirectory, result); |
| case base::DIR_HOME: { |
| *result = base::mac::NSStringToFilePath(NSHomeDirectory()); |
| return true; |