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

Unified Diff: chrome/app/chrome_main_delegate.cc

Issue 9316077: Enable audio/video tag in content_shell (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix content_unittests Created 8 years, 9 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 | « no previous file | chrome/common/chrome_paths.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/chrome_main_delegate.cc
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index 27823d4e4617ac335677ac4758eaf73d65b94ea7..f689512dbc8ada5a69d8381b65452cfb01586775 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -34,7 +34,6 @@
#include "content/public/common/content_client.h"
#include "content/public/common/content_paths.h"
#include "content/public/common/content_switches.h"
-#include "media/base/media.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_switches.h"
@@ -717,12 +716,6 @@ bool ChromeMainDelegate::DelaySandboxInitialization(
}
#elif defined(OS_POSIX)
content::ZygoteForkDelegate* ChromeMainDelegate::ZygoteStarting() {
- // Each Renderer we spawn will re-attempt initialization of the media
- // libraries, at which point failure will be detected and handled, so
- // we do not need to cope with initialization failures here.
- FilePath media_path;
- if (PathService::Get(chrome::DIR_MEDIA_LIBS, &media_path))
- media::InitializeMediaLibrary(media_path);
#if defined(DISABLE_NACL)
return NULL;
#else
« no previous file with comments | « no previous file | chrome/common/chrome_paths.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698