| 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 "chrome/common/chrome_paths.h" | 5 #include "chrome/common/chrome_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/logging.h" | 10 #include "base/logging.h" |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 break; | 163 break; |
| 164 case chrome::FILE_LIBAVCODEC: | 164 case chrome::FILE_LIBAVCODEC: |
| 165 if (!GetFFmpegLibraryPath(&cur, FILE_PATH_LITERAL("avcodec-52.dll"))) | 165 if (!GetFFmpegLibraryPath(&cur, FILE_PATH_LITERAL("avcodec-52.dll"))) |
| 166 return false; | 166 return false; |
| 167 break; | 167 break; |
| 168 case chrome::FILE_LIBAVFORMAT: | 168 case chrome::FILE_LIBAVFORMAT: |
| 169 if (!GetFFmpegLibraryPath(&cur, FILE_PATH_LITERAL("avformat-52.dll"))) | 169 if (!GetFFmpegLibraryPath(&cur, FILE_PATH_LITERAL("avformat-52.dll"))) |
| 170 return false; | 170 return false; |
| 171 break; | 171 break; |
| 172 case chrome::FILE_LIBAVUTIL: | 172 case chrome::FILE_LIBAVUTIL: |
| 173 if (!GetFFmpegLibraryPath(&cur, FILE_PATH_LITERAL("avutil-49.dll"))) | 173 if (!GetFFmpegLibraryPath(&cur, FILE_PATH_LITERAL("avutil-50.dll"))) |
| 174 return false; | 174 return false; |
| 175 break; | 175 break; |
| 176 // The following are only valid in the development environment, and | 176 // The following are only valid in the development environment, and |
| 177 // will fail if executed from an installed executable (because the | 177 // will fail if executed from an installed executable (because the |
| 178 // generated path won't exist). | 178 // generated path won't exist). |
| 179 case chrome::DIR_TEST_DATA: | 179 case chrome::DIR_TEST_DATA: |
| 180 if (!PathService::Get(base::DIR_SOURCE_ROOT, &cur)) | 180 if (!PathService::Get(base::DIR_SOURCE_ROOT, &cur)) |
| 181 return false; | 181 return false; |
| 182 cur = cur.Append(FILE_PATH_LITERAL("chrome")); | 182 cur = cur.Append(FILE_PATH_LITERAL("chrome")); |
| 183 cur = cur.Append(FILE_PATH_LITERAL("test")); | 183 cur = cur.Append(FILE_PATH_LITERAL("test")); |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 226 return true; | 226 return true; |
| 227 } | 227 } |
| 228 | 228 |
| 229 // This cannot be done as a static initializer sadly since Visual Studio will | 229 // This cannot be done as a static initializer sadly since Visual Studio will |
| 230 // eliminate this object file if there is no direct entry point into it. | 230 // eliminate this object file if there is no direct entry point into it. |
| 231 void RegisterPathProvider() { | 231 void RegisterPathProvider() { |
| 232 PathService::RegisterProvider(PathProvider, PATH_START, PATH_END); | 232 PathService::RegisterProvider(PathProvider, PATH_START, PATH_END); |
| 233 } | 233 } |
| 234 | 234 |
| 235 } // namespace chrome | 235 } // namespace chrome |
| OLD | NEW |