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

Side by Side Diff: content/public/renderer/content_renderer_client.cc

Issue 883353012: Pass default renderer factory into CreateMediaRendererFactory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use scoped_ptr implicit upcast Created 5 years, 10 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/public/renderer/content_renderer_client.h" 5 #include "content/public/renderer/content_renderer_client.h"
6 6
7 #include "media/base/renderer_factory.h" 7 #include "media/base/renderer_factory.h"
8 #include "media/filters/default_renderer_factory.h"
8 #include "third_party/WebKit/public/web/WebPluginPlaceholder.h" 9 #include "third_party/WebKit/public/web/WebPluginPlaceholder.h"
9 10
10 namespace content { 11 namespace content {
11 12
12 SkBitmap* ContentRendererClient::GetSadPluginBitmap() { 13 SkBitmap* ContentRendererClient::GetSadPluginBitmap() {
13 return nullptr; 14 return nullptr;
14 } 15 }
15 16
16 SkBitmap* ContentRendererClient::GetSadWebViewBitmap() { 17 SkBitmap* ContentRendererClient::GetSadWebViewBitmap() {
17 return nullptr; 18 return nullptr;
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 169
169 bool ContentRendererClient::AllowPepperMediaStreamAPI(const GURL& url) { 170 bool ContentRendererClient::AllowPepperMediaStreamAPI(const GURL& url) {
170 return false; 171 return false;
171 } 172 }
172 173
173 void ContentRendererClient::AddKeySystems( 174 void ContentRendererClient::AddKeySystems(
174 std::vector<media::KeySystemInfo>* key_systems) { 175 std::vector<media::KeySystemInfo>* key_systems) {
175 } 176 }
176 177
177 scoped_ptr<media::RendererFactory> 178 scoped_ptr<media::RendererFactory>
178 ContentRendererClient::CreateMediaRendererFactory(RenderFrame* render_frame) { 179 ContentRendererClient::CreateMediaRendererFactory(
179 return nullptr; 180 RenderFrame* render_frame,
181 scoped_ptr<media::DefaultRendererFactory> default_factory) {
182 return default_factory.Pass();
180 } 183 }
181 184
182 bool ContentRendererClient::ShouldReportDetailedMessageForSource( 185 bool ContentRendererClient::ShouldReportDetailedMessageForSource(
183 const base::string16& source) const { 186 const base::string16& source) const {
184 return false; 187 return false;
185 } 188 }
186 189
187 bool ContentRendererClient::ShouldEnableSiteIsolationPolicy() const { 190 bool ContentRendererClient::ShouldEnableSiteIsolationPolicy() const {
188 return true; 191 return true;
189 } 192 }
(...skipping 17 matching lines...) Expand all
207 const std::string& mime_type, 210 const std::string& mime_type,
208 const GURL& original_url) { 211 const GURL& original_url) {
209 return nullptr; 212 return nullptr;
210 } 213 }
211 214
212 std::string ContentRendererClient::GetUserAgentOverrideForURL(const GURL& url) { 215 std::string ContentRendererClient::GetUserAgentOverrideForURL(const GURL& url) {
213 return std::string(); 216 return std::string();
214 } 217 }
215 218
216 } // namespace content 219 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698