Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(167)

Side by Side Diff: chrome/plugin/chrome_content_plugin_client.cc

Issue 1179953006: [Merge to M44] Chromium changes to statically link ffmpeg. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2403
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/interactive_ui_tests.isolate ('k') | chrome/sync_integration_tests.isolate » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 // Load media libraries for the Chromoting client plugin. 46 // Initialize media libraries for the Chromoting client plugin.
47 base::FilePath media_path; 47 media::InitializeMediaLibrary();
48 PathService::Get(content::DIR_MEDIA_LIBS, &media_path);
49 if (!media_path.empty())
50 media::InitializeMediaLibrary(media_path);
51 48
52 #endif // defined(ENABLE_REMOTING) 49 #endif // defined(ENABLE_REMOTING)
53 } 50 }
54 51
55 } // namespace chrome 52 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/interactive_ui_tests.isolate ('k') | chrome/sync_integration_tests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698