Fold WebMediaPlayerImpl::Initialize() into the constructor.

OverrideCreateWebMediaPlayer() was simplified to return a pointer instead of relying on a bool+out-param since unlike OverrideCreatePlugin() we don't require blocking creation of media players.

BUG=109958


Review URL: http://codereview.chromium.org/9187045

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117607 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 7 deletions

diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
index 279d65b..7a9d7cd 100644
--- a/content/public/renderer/content_renderer_client.h
+++ b/content/public/renderer/content_renderer_client.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -104,19 +104,18 @@ class ContentRendererClient {
       std::string* error_html,
       string16* error_description) = 0;
 
-  // Allows embedder to override creating a WebMediaPlayer. If it returns
-  // true, then |player| will contain the created player. Else the content
-  // layer should create the media player.
-  virtual bool OverrideCreateWebMediaPlayer(
+  // Allows embedder to override creating a WebMediaPlayerImpl. If it returns
+  // NULL the content layer will create the media player.
+  virtual webkit_media::WebMediaPlayerImpl* OverrideCreateWebMediaPlayer(
       RenderView* render_view,
+      WebKit::WebFrame* frame,
       WebKit::WebMediaPlayerClient* client,
       base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate,
       media::FilterCollection* collection,
       WebKit::WebAudioSourceProvider* audio_source_provider,
       media::MessageLoopFactory* message_loop_factory,
       webkit_media::MediaStreamClient* media_stream_client,
-      media::MediaLog* media_log,
-      webkit_media::WebMediaPlayerImpl** player) = 0;
+      media::MediaLog* media_log) = 0;
 
   // Returns true if the renderer process should schedule the idle handler when
   // all widgets are hidden.