Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(631)

Side by Side Diff: base/base_paths_mac.mm

Issue 12282019: Disable "using base::FilePath" on Linux since it now compiles. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | base/file_path.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Defines base::PathProviderMac which replaces base::PathProviderPosix for Mac 5 // Defines base::PathProviderMac which replaces base::PathProviderPosix for Mac
6 // in base/path_service.cc. 6 // in base/path_service.cc.
7 7
8 #include <dlfcn.h> 8 #include <dlfcn.h>
9 #import <Foundation/Foundation.h> 9 #import <Foundation/Foundation.h>
10 #include <mach-o/dyld.h> 10 #include <mach-o/dyld.h>
11 11
12 #include "base/base_paths.h" 12 #include "base/base_paths.h"
13 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
14 #include "base/file_path.h" 14 #include "base/file_path.h"
15 #include "base/file_util.h" 15 #include "base/file_util.h"
16 #include "base/logging.h" 16 #include "base/logging.h"
17 #include "base/mac/foundation_util.h" 17 #include "base/mac/foundation_util.h"
18 #include "base/path_service.h" 18 #include "base/path_service.h"
19 #include "base/string_util.h" 19 #include "base/string_util.h"
20 #include "build/build_config.h" 20 #include "build/build_config.h"
21 21
22 namespace { 22 namespace {
23 23
24 void GetNSExecutablePath(FilePath* path) { 24 void GetNSExecutablePath(base::FilePath* path) {
25 DCHECK(path); 25 DCHECK(path);
26 // Executable path can have relative references ("..") depending on 26 // Executable path can have relative references ("..") depending on
27 // how the app was launched. 27 // how the app was launched.
28 uint32_t executable_length = 0; 28 uint32_t executable_length = 0;
29 _NSGetExecutablePath(NULL, &executable_length); 29 _NSGetExecutablePath(NULL, &executable_length);
30 DCHECK_GT(executable_length, 1u); 30 DCHECK_GT(executable_length, 1u);
31 std::string executable_path; 31 std::string executable_path;
32 int rv = _NSGetExecutablePath(WriteInto(&executable_path, executable_length), 32 int rv = _NSGetExecutablePath(WriteInto(&executable_path, executable_length),
33 &executable_length); 33 &executable_length);
34 DCHECK_EQ(rv, 0); 34 DCHECK_EQ(rv, 0);
35 *path = FilePath(executable_path); 35 *path = base::FilePath(executable_path);
36 } 36 }
37 37
38 // Returns true if the module for |address| is found. |path| will contain 38 // Returns true if the module for |address| is found. |path| will contain
39 // the path to the module. Note that |path| may not be absolute. 39 // the path to the module. Note that |path| may not be absolute.
40 bool GetModulePathForAddress(FilePath* path, 40 bool GetModulePathForAddress(base::FilePath* path,
41 const void* address) WARN_UNUSED_RESULT; 41 const void* address) WARN_UNUSED_RESULT;
42 42
43 bool GetModulePathForAddress(FilePath* path, const void* address) { 43 bool GetModulePathForAddress(base::FilePath* path, const void* address) {
44 Dl_info info; 44 Dl_info info;
45 if (dladdr(address, &info) == 0) 45 if (dladdr(address, &info) == 0)
46 return false; 46 return false;
47 *path = FilePath(info.dli_fname); 47 *path = base::FilePath(info.dli_fname);
48 return true; 48 return true;
49 } 49 }
50 50
51 } // namespace 51 } // namespace
52 52
53 namespace base { 53 namespace base {
54 54
55 bool PathProviderMac(int key, FilePath* result) { 55 bool PathProviderMac(int key, base::FilePath* result) {
56 switch (key) { 56 switch (key) {
57 case base::FILE_EXE: 57 case base::FILE_EXE:
58 GetNSExecutablePath(result); 58 GetNSExecutablePath(result);
59 return true; 59 return true;
60 case base::FILE_MODULE: 60 case base::FILE_MODULE:
61 return GetModulePathForAddress(result, 61 return GetModulePathForAddress(result,
62 reinterpret_cast<const void*>(&base::PathProviderMac)); 62 reinterpret_cast<const void*>(&base::PathProviderMac));
63 case base::DIR_APP_DATA: { 63 case base::DIR_APP_DATA: {
64 bool success = base::mac::GetUserDirectory(NSApplicationSupportDirectory, 64 bool success = base::mac::GetUserDirectory(NSApplicationSupportDirectory,
65 result); 65 result);
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 return base::mac::GetUserDirectory(NSCachesDirectory, result); 103 return base::mac::GetUserDirectory(NSCachesDirectory, result);
104 case base::DIR_HOME: 104 case base::DIR_HOME:
105 *result = base::mac::NSStringToFilePath(NSHomeDirectory()); 105 *result = base::mac::NSStringToFilePath(NSHomeDirectory());
106 return true; 106 return true;
107 default: 107 default:
108 return false; 108 return false;
109 } 109 }
110 } 110 }
111 111
112 } // namespace base 112 } // namespace base
OLDNEW
« no previous file with comments | « no previous file | base/file_path.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698