Chromium Code Reviews| Index: base/base_paths.cc |
| diff --git a/base/base_paths.cc b/base/base_paths.cc |
| index b4fc28b6c75daabbacce8cbed9e33a2ff792ef40..90695ba69813b04e6121aa52e61241f74f08185b 100644 |
| --- a/base/base_paths.cc |
| +++ b/base/base_paths.cc |
| @@ -13,35 +13,33 @@ namespace base { |
| bool PathProvider(int key, FilePath* result) { |
| // NOTE: DIR_CURRENT is a special case in PathService::Get |
| - FilePath cur; |
| switch (key) { |
| case DIR_EXE: |
| - PathService::Get(FILE_EXE, &cur); |
| - cur = cur.DirName(); |
| - break; |
| + PathService::Get(FILE_EXE, result); |
| + *result = result->DirName(); |
| + return true; |
| case DIR_MODULE: |
| - PathService::Get(FILE_MODULE, &cur); |
| - cur = cur.DirName(); |
| - break; |
| + PathService::Get(FILE_MODULE, result); |
| + *result = result->DirName(); |
| + return true; |
| case DIR_TEMP: |
| - if (!base::GetTempDir(&cur)) |
| + if (!GetTempDir(result)) |
| return false; |
| - break; |
| + return true; |
| + case base::DIR_HOME: |
| + *result = GetHomeDir(); |
| + return true; |
| case DIR_TEST_DATA: |
| - if (!PathService::Get(DIR_SOURCE_ROOT, &cur)) |
| + if (!PathService::Get(DIR_SOURCE_ROOT, result)) |
| return false; |
| - cur = cur.Append(FILE_PATH_LITERAL("base")); |
| - cur = cur.Append(FILE_PATH_LITERAL("test")); |
| - cur = cur.Append(FILE_PATH_LITERAL("data")); |
| - if (!base::PathExists(cur)) // We don't want to create this. |
| + *result = result->Append(FILE_PATH_LITERAL("base")); |
| + *result = result->Append(FILE_PATH_LITERAL("test")); |
| + *result = result->Append(FILE_PATH_LITERAL("data")); |
| + if (!PathExists(*result)) // We don't want to create this. |
| return false; |
| - break; |
| - default: |
|
benwells
2014/02/16 23:39:50
Nit: I thought google style was to handle the defa
brettw
2014/02/18 19:24:42
Oh, OK. I was just making this match the other fil
|
| - return false; |
| + return true; |
| } |
| - |
| - *result = cur; |
| - return true; |
| + return false; |
| } |
| } // namespace base |