Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 Loading... | |
| 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 scoped_ptr<media::RendererFactory> factory(default_factory.Pass()); | |
| 183 return factory.Pass(); | |
|
gunsch
2015/02/12 01:19:34
I think this can just be:
return default_factory.
servolk
2015/02/12 02:20:26
Hmm, I can't find scoped_ptr::PassAs method. The o
gunsch
2015/02/12 03:18:51
Oh, I think you can just use Pass now without the
servolk
2015/02/17 18:55:05
Done.
| |
| 180 } | 184 } |
| 181 | 185 |
| 182 bool ContentRendererClient::ShouldReportDetailedMessageForSource( | 186 bool ContentRendererClient::ShouldReportDetailedMessageForSource( |
| 183 const base::string16& source) const { | 187 const base::string16& source) const { |
| 184 return false; | 188 return false; |
| 185 } | 189 } |
| 186 | 190 |
| 187 bool ContentRendererClient::ShouldEnableSiteIsolationPolicy() const { | 191 bool ContentRendererClient::ShouldEnableSiteIsolationPolicy() const { |
| 188 return true; | 192 return true; |
| 189 } | 193 } |
| (...skipping 17 matching lines...) Expand all Loading... | |
| 207 const std::string& mime_type, | 211 const std::string& mime_type, |
| 208 const GURL& original_url) { | 212 const GURL& original_url) { |
| 209 return nullptr; | 213 return nullptr; |
| 210 } | 214 } |
| 211 | 215 |
| 212 std::string ContentRendererClient::GetUserAgentOverrideForURL(const GURL& url) { | 216 std::string ContentRendererClient::GetUserAgentOverrideForURL(const GURL& url) { |
| 213 return std::string(); | 217 return std::string(); |
| 214 } | 218 } |
| 215 | 219 |
| 216 } // namespace content | 220 } // namespace content |
| OLD | NEW |