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

Unified Diff: chrome/plugin/chrome_content_plugin_client.cc

Issue 1141703002: Chromium changes for static linking ffmpeg (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Roll DEPS to fix cros, rebase. 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/interactive_ui_tests.isolate ('k') | chrome/sync_integration_tests.isolate » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/plugin/chrome_content_plugin_client.cc
diff --git a/chrome/plugin/chrome_content_plugin_client.cc b/chrome/plugin/chrome_content_plugin_client.cc
index d54e0c4960c87353b6764ff3fab8f9babdc75b4f..3e254c64b4bc85118c4d20a4e2a7bf0aff66b4e1 100644
--- a/chrome/plugin/chrome_content_plugin_client.cc
+++ b/chrome/plugin/chrome_content_plugin_client.cc
@@ -44,11 +44,8 @@ void ChromeContentPluginClient::PreSandboxInitialization() {
LOG(ERROR) << "Failed to load crypto32.dll: " << error.ToString();
#endif // defined(OS_WIN)
- // Load media libraries for the Chromoting client plugin.
- base::FilePath media_path;
- PathService::Get(content::DIR_MEDIA_LIBS, &media_path);
- if (!media_path.empty())
- media::InitializeMediaLibrary(media_path);
+ // Initialize media libraries for the Chromoting client plugin.
+ media::InitializeMediaLibrary();
#endif // defined(ENABLE_REMOTING)
}
« 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