| OLD | NEW |
| 1 // Copyright (c) 2006-2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2010 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_util.h" | 8 #include "base/file_util.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 if (!GetInternalPluginsDirectory(&cur)) | 232 if (!GetInternalPluginsDirectory(&cur)) |
| 233 return false; | 233 return false; |
| 234 #if defined(OS_WIN) | 234 #if defined(OS_WIN) |
| 235 cur = cur.Append(FILE_PATH_LITERAL("pdf.dll")); | 235 cur = cur.Append(FILE_PATH_LITERAL("pdf.dll")); |
| 236 #elif defined(OS_MACOSX) | 236 #elif defined(OS_MACOSX) |
| 237 cur = cur.Append(FILE_PATH_LITERAL("PDF.plugin")); | 237 cur = cur.Append(FILE_PATH_LITERAL("PDF.plugin")); |
| 238 #else // Linux and Chrome OS | 238 #else // Linux and Chrome OS |
| 239 cur = cur.Append(FILE_PATH_LITERAL("libpdf.so")); | 239 cur = cur.Append(FILE_PATH_LITERAL("libpdf.so")); |
| 240 #endif | 240 #endif |
| 241 break; | 241 break; |
| 242 case chrome::FILE_NACL_PLUGIN: |
| 243 if (!GetInternalPluginsDirectory(&cur)) |
| 244 return false; |
| 245 #if defined(OS_WIN) |
| 246 cur = cur.Append(FILE_PATH_LITERAL("ppGoogleNaClPluginChrome.dll")); |
| 247 #elif defined(OS_MACOSX) |
| 248 // TODO(noelallen) Please verify this extention name is correct. |
| 249 cur = cur.Append(FILE_PATH_LITERAL("ppGoogleNaClPluginChrome.plugin")); |
| 250 #else // Linux and Chrome OS |
| 251 cur = cur.Append(FILE_PATH_LITERAL("libppGoogleNaClPluginChrome.so")); |
| 252 #endif |
| 253 break; |
| 242 case chrome::FILE_RESOURCES_PACK: | 254 case chrome::FILE_RESOURCES_PACK: |
| 243 #if defined(OS_MACOSX) | 255 #if defined(OS_MACOSX) |
| 244 if (mac_util::AmIBundled()) { | 256 if (mac_util::AmIBundled()) { |
| 245 cur = mac_util::MainAppBundlePath(); | 257 cur = mac_util::MainAppBundlePath(); |
| 246 cur = cur.Append(FILE_PATH_LITERAL("Resources")) | 258 cur = cur.Append(FILE_PATH_LITERAL("Resources")) |
| 247 .Append(FILE_PATH_LITERAL("resources.pak")); | 259 .Append(FILE_PATH_LITERAL("resources.pak")); |
| 248 break; | 260 break; |
| 249 } | 261 } |
| 250 // If we're not bundled on mac, resources.pak should be next to the | 262 // If we're not bundled on mac, resources.pak should be next to the |
| 251 // binary (e.g., for unit tests). | 263 // binary (e.g., for unit tests). |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 321 return true; | 333 return true; |
| 322 } | 334 } |
| 323 | 335 |
| 324 // This cannot be done as a static initializer sadly since Visual Studio will | 336 // This cannot be done as a static initializer sadly since Visual Studio will |
| 325 // eliminate this object file if there is no direct entry point into it. | 337 // eliminate this object file if there is no direct entry point into it. |
| 326 void RegisterPathProvider() { | 338 void RegisterPathProvider() { |
| 327 PathService::RegisterProvider(PathProvider, PATH_START, PATH_END); | 339 PathService::RegisterProvider(PathProvider, PATH_START, PATH_END); |
| 328 } | 340 } |
| 329 | 341 |
| 330 } // namespace chrome | 342 } // namespace chrome |
| OLD | NEW |