| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 #include "base/base_paths.h" | 5 #include "base/base_paths.h" |
| 6 | 6 |
| 7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
| 8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
| 9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
| 10 | 10 |
| 11 namespace base { | 11 namespace base { |
| 12 | 12 |
| 13 bool PathProvider(int key, FilePath* result) { | 13 bool PathProvider(int key, FilePath* result) { |
| 14 // NOTE: DIR_CURRENT is a special case in PathService::Get | 14 // NOTE: DIR_CURRENT is a special case in PathService::Get |
| 15 | 15 |
| 16 FilePath cur; | |
| 17 switch (key) { | 16 switch (key) { |
| 18 case DIR_EXE: | 17 case DIR_EXE: |
| 19 PathService::Get(FILE_EXE, &cur); | 18 PathService::Get(FILE_EXE, result); |
| 20 cur = cur.DirName(); | 19 *result = result->DirName(); |
| 21 break; | 20 return true; |
| 22 case DIR_MODULE: | 21 case DIR_MODULE: |
| 23 PathService::Get(FILE_MODULE, &cur); | 22 PathService::Get(FILE_MODULE, result); |
| 24 cur = cur.DirName(); | 23 *result = result->DirName(); |
| 25 break; | 24 return true; |
| 26 case DIR_TEMP: | 25 case DIR_TEMP: |
| 27 if (!base::GetTempDir(&cur)) | 26 if (!GetTempDir(result)) |
| 28 return false; | 27 return false; |
| 29 break; | 28 return true; |
| 29 case base::DIR_HOME: |
| 30 *result = GetHomeDir(); |
| 31 return true; |
| 30 case DIR_TEST_DATA: | 32 case DIR_TEST_DATA: |
| 31 if (!PathService::Get(DIR_SOURCE_ROOT, &cur)) | 33 if (!PathService::Get(DIR_SOURCE_ROOT, result)) |
| 32 return false; | 34 return false; |
| 33 cur = cur.Append(FILE_PATH_LITERAL("base")); | 35 *result = result->Append(FILE_PATH_LITERAL("base")); |
| 34 cur = cur.Append(FILE_PATH_LITERAL("test")); | 36 *result = result->Append(FILE_PATH_LITERAL("test")); |
| 35 cur = cur.Append(FILE_PATH_LITERAL("data")); | 37 *result = result->Append(FILE_PATH_LITERAL("data")); |
| 36 if (!base::PathExists(cur)) // We don't want to create this. | 38 if (!PathExists(*result)) // We don't want to create this. |
| 37 return false; | 39 return false; |
| 38 break; | 40 return true; |
| 39 default: | 41 default: |
| 40 return false; | 42 return false; |
| 41 } | 43 } |
| 42 | |
| 43 *result = cur; | |
| 44 return true; | |
| 45 } | 44 } |
| 46 | 45 |
| 47 } // namespace base | 46 } // namespace base |
| OLD | NEW |