| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/plugin/chrome_content_plugin_client.h" | 5 #include "chrome/plugin/chrome_content_plugin_client.h" |
| 6 | 6 |
| 7 #if defined(ENABLE_REMOTING) | 7 #if defined(ENABLE_REMOTING) |
| 8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
| 9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
| 10 #include "content/public/common/content_paths.h" | 10 #include "content/public/common/content_paths.h" |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 // before the sandbox is initialized. | 37 // before the sandbox is initialized. |
| 38 crypto::ForceNSSNoDBInit(); | 38 crypto::ForceNSSNoDBInit(); |
| 39 crypto::EnsureNSSInit(); | 39 crypto::EnsureNSSInit(); |
| 40 #elif defined(OS_WIN) | 40 #elif defined(OS_WIN) |
| 41 // crypt32.dll is used to decode X509 certificates for Chromoting. | 41 // crypt32.dll is used to decode X509 certificates for Chromoting. |
| 42 base::NativeLibraryLoadError error; | 42 base::NativeLibraryLoadError error; |
| 43 if (base::LoadNativeLibrary(base::FilePath(L"crypt32.dll"), &error) == NULL) | 43 if (base::LoadNativeLibrary(base::FilePath(L"crypt32.dll"), &error) == NULL) |
| 44 LOG(ERROR) << "Failed to load crypto32.dll: " << error.ToString(); | 44 LOG(ERROR) << "Failed to load crypto32.dll: " << error.ToString(); |
| 45 #endif // defined(OS_WIN) | 45 #endif // defined(OS_WIN) |
| 46 | 46 |
| 47 // Load media libraries for the Chromoting client plugin. | 47 // Initialize media libraries for the Chromoting client plugin. |
| 48 base::FilePath media_path; | 48 media::InitializeMediaLibrary(); |
| 49 PathService::Get(content::DIR_MEDIA_LIBS, &media_path); | |
| 50 if (!media_path.empty()) | |
| 51 media::InitializeMediaLibrary(media_path); | |
| 52 | 49 |
| 53 #endif // defined(ENABLE_REMOTING) | 50 #endif // defined(ENABLE_REMOTING) |
| 54 } | 51 } |
| 55 | 52 |
| 56 } // namespace chrome | 53 } // namespace chrome |
| OLD | NEW |