Chromium Code Reviews| Index: chrome/renderer/chrome_render_process_observer.cc |
| diff --git a/chrome/renderer/chrome_render_process_observer.cc b/chrome/renderer/chrome_render_process_observer.cc |
| index ed58e72b50d51e022889f08a343d1b6f32c7aacf..f0e4fef61b15b98aa0d5f25c7ae74dd049e0f51d 100644 |
| --- a/chrome/renderer/chrome_render_process_observer.cc |
| +++ b/chrome/renderer/chrome_render_process_observer.cc |
| @@ -28,7 +28,6 @@ |
| #include "content/public/renderer/render_view_visitor.h" |
| #include "content/public/renderer/render_view.h" |
| #include "crypto/nss_util.h" |
| -#include "media/base/media.h" |
| #include "media/base/media_switches.h" |
| #include "net/base/net_errors.h" |
| #include "net/base/net_module.h" |
| @@ -223,13 +222,6 @@ ChromeRenderProcessObserver::ChromeRenderProcessObserver( |
| std::string error; |
| base::LoadNativeLibrary(FilePath(L"crypt32.dll"), &error); |
| #endif |
| - |
| - // Note that under Linux, the media library will normally already have |
| - // been initialized by the Zygote before this instance became a Renderer. |
| - FilePath media_path; |
| - PathService::Get(chrome::DIR_MEDIA_LIBS, &media_path); |
| - if (!media_path.empty()) |
| - media::InitializeMediaLibrary(media_path); |
| } |
| ChromeRenderProcessObserver::~ChromeRenderProcessObserver() { |
| @@ -264,7 +256,6 @@ bool ChromeRenderProcessObserver::OnControlMessageReceived( |
| } |
| void ChromeRenderProcessObserver::WebKitInitialized() { |
|
jam
2012/03/06 21:26:17
nit: delete this function since it's now empty
vrk (LEFT CHROMIUM)
2012/03/06 22:11:42
Done.
|
| - WebRuntimeFeatures::enableMediaPlayer(media::IsMediaLibraryInitialized()); |
| } |
| void ChromeRenderProcessObserver::OnSetIsIncognitoProcess( |