| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/file_util.h" | 7 #include "base/file_util.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/mac/bundle_locations.h" | 9 #include "base/mac/bundle_locations.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 360 cur = cur.Append(kO3DPluginFileName); | 360 cur = cur.Append(kO3DPluginFileName); |
| 361 break; | 361 break; |
| 362 case chrome::FILE_GTALK_PLUGIN: | 362 case chrome::FILE_GTALK_PLUGIN: |
| 363 if (!PathService::Get(base::DIR_MODULE, &cur)) | 363 if (!PathService::Get(base::DIR_MODULE, &cur)) |
| 364 return false; | 364 return false; |
| 365 cur = cur.Append(kGTalkPluginFileName); | 365 cur = cur.Append(kGTalkPluginFileName); |
| 366 break; | 366 break; |
| 367 #endif | 367 #endif |
| 368 #if defined(WIDEVINE_CDM_AVAILABLE) | 368 #if defined(WIDEVINE_CDM_AVAILABLE) |
| 369 case chrome::FILE_WIDEVINE_CDM_PLUGIN: | 369 case chrome::FILE_WIDEVINE_CDM_PLUGIN: |
| 370 if (!PathService::Get(base::DIR_MODULE, &cur)) | 370 if (!GetInternalPluginsDirectory(&cur)) |
| 371 return false; | 371 return false; |
| 372 cur = cur.Append(kWidevineCdmPluginFileName); | 372 cur = cur.Append(kWidevineCdmPluginFileName); |
| 373 break; | 373 break; |
| 374 #endif | 374 #endif |
| 375 case chrome::FILE_RESOURCES_PACK: | 375 case chrome::FILE_RESOURCES_PACK: |
| 376 #if defined(OS_MACOSX) && !defined(OS_IOS) | 376 #if defined(OS_MACOSX) && !defined(OS_IOS) |
| 377 if (base::mac::AmIBundled()) { | 377 if (base::mac::AmIBundled()) { |
| 378 cur = base::mac::FrameworkBundlePath(); | 378 cur = base::mac::FrameworkBundlePath(); |
| 379 cur = cur.Append(FILE_PATH_LITERAL("Resources")) | 379 cur = cur.Append(FILE_PATH_LITERAL("Resources")) |
| 380 .Append(FILE_PATH_LITERAL("resources.pak")); | 380 .Append(FILE_PATH_LITERAL("resources.pak")); |
| (...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 540 return true; | 540 return true; |
| 541 } | 541 } |
| 542 | 542 |
| 543 // This cannot be done as a static initializer sadly since Visual Studio will | 543 // This cannot be done as a static initializer sadly since Visual Studio will |
| 544 // eliminate this object file if there is no direct entry point into it. | 544 // eliminate this object file if there is no direct entry point into it. |
| 545 void RegisterPathProvider() { | 545 void RegisterPathProvider() { |
| 546 PathService::RegisterProvider(PathProvider, PATH_START, PATH_END); | 546 PathService::RegisterProvider(PathProvider, PATH_START, PATH_END); |
| 547 } | 547 } |
| 548 | 548 |
| 549 } // namespace chrome | 549 } // namespace chrome |
| OLD | NEW |