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 25 matching lines...) Expand all Loading... |
36 // before the sandbox is initialized. | 36 // before the sandbox is initialized. |
37 crypto::ForceNSSNoDBInit(); | 37 crypto::ForceNSSNoDBInit(); |
38 crypto::EnsureNSSInit(); | 38 crypto::EnsureNSSInit(); |
39 #elif defined(OS_WIN) | 39 #elif defined(OS_WIN) |
40 // crypt32.dll is used to decode X509 certificates for Chromoting. | 40 // crypt32.dll is used to decode X509 certificates for Chromoting. |
41 base::NativeLibraryLoadError error; | 41 base::NativeLibraryLoadError error; |
42 if (base::LoadNativeLibrary(base::FilePath(L"crypt32.dll"), &error) == NULL) | 42 if (base::LoadNativeLibrary(base::FilePath(L"crypt32.dll"), &error) == NULL) |
43 LOG(ERROR) << "Failed to load crypto32.dll: " << error.ToString(); | 43 LOG(ERROR) << "Failed to load crypto32.dll: " << error.ToString(); |
44 #endif // defined(OS_WIN) | 44 #endif // defined(OS_WIN) |
45 | 45 |
46 // Initialize media libraries for the Chromoting client plugin. | 46 // Load media libraries for the Chromoting client plugin. |
47 media::InitializeMediaLibrary(); | 47 base::FilePath media_path; |
| 48 PathService::Get(content::DIR_MEDIA_LIBS, &media_path); |
| 49 if (!media_path.empty()) |
| 50 media::InitializeMediaLibrary(media_path); |
48 | 51 |
49 #endif // defined(ENABLE_REMOTING) | 52 #endif // defined(ENABLE_REMOTING) |
50 } | 53 } |
51 | 54 |
52 } // namespace chrome | 55 } // namespace chrome |
OLD | NEW |