Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this |
| 2 // source code is governed by a BSD-style license that can be found in the | 2 // source code is governed by a BSD-style license that can be found in the |
| 3 // LICENSE file. | 3 // LICENSE file. |
| 4 | 4 |
| 5 #include "app/app_paths.h" | 5 #include "app/app_paths.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/file_path.h" | 8 #include "base/file_path.h" |
| 9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 49 // the App dir. If there are none, it may not exist. | 49 // the App dir. If there are none, it may not exist. |
| 50 cur = cur.DirName(); | 50 cur = cur.DirName(); |
| 51 cur = cur.Append(FILE_PATH_LITERAL("Extensions")); | 51 cur = cur.Append(FILE_PATH_LITERAL("Extensions")); |
| 52 create_dir = false; | 52 create_dir = false; |
| 53 #else | 53 #else |
| 54 cur = cur.Append(FILE_PATH_LITERAL("extensions")); | 54 cur = cur.Append(FILE_PATH_LITERAL("extensions")); |
| 55 create_dir = true; | 55 create_dir = true; |
| 56 #endif | 56 #endif |
| 57 break; | 57 break; |
| 58 case app::FILE_RESOURCES_PAK: | 58 case app::FILE_RESOURCES_PAK: |
| 59 #if defined(OS_LINUX) | 59 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
|
Evan Martin
2010/05/12 10:20:47
I think Mac uses pakfiles as well... why was this
Peter Valchev
2010/05/12 23:05:13
I think it didn't find the pak file, this makes it
| |
| 60 if (!PathService::Get(base::DIR_EXE, &cur)) | 60 if (!PathService::Get(base::DIR_EXE, &cur)) |
| 61 return false; | 61 return false; |
| 62 // TODO(tony): We shouldn't be referencing chrome here. | 62 // TODO(tony): We shouldn't be referencing chrome here. |
| 63 cur = cur.AppendASCII("chrome.pak"); | 63 cur = cur.AppendASCII("chrome.pak"); |
| 64 #else | 64 #else |
| 65 NOTREACHED(); | 65 NOTREACHED(); |
| 66 #endif | 66 #endif |
| 67 break; | 67 break; |
| 68 // The following are only valid in the development environment, and | 68 // The following are only valid in the development environment, and |
| 69 // will fail if executed from an installed executable (because the | 69 // will fail if executed from an installed executable (because the |
| (...skipping 19 matching lines...) Expand all Loading... | |
| 89 return true; | 89 return true; |
| 90 } | 90 } |
| 91 | 91 |
| 92 // This cannot be done as a static initializer sadly since Visual Studio will | 92 // This cannot be done as a static initializer sadly since Visual Studio will |
| 93 // eliminate this object file if there is no direct entry point into it. | 93 // eliminate this object file if there is no direct entry point into it. |
| 94 void RegisterPathProvider() { | 94 void RegisterPathProvider() { |
| 95 PathService::RegisterProvider(PathProvider, PATH_START, PATH_END); | 95 PathService::RegisterProvider(PathProvider, PATH_START, PATH_END); |
| 96 } | 96 } |
| 97 | 97 |
| 98 } // namespace app | 98 } // namespace app |
| OLD | NEW |