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.h" | 7 #include "media/base/renderer_factory.h" |
| 8 #include "third_party/WebKit/public/web/WebPluginPlaceholder.h" | 8 #include "third_party/WebKit/public/web/WebPluginPlaceholder.h" |
| 9 | 9 |
| 10 namespace content { | 10 namespace content { |
| 11 | 11 |
| 12 SkBitmap* ContentRendererClient::GetSadPluginBitmap() { | 12 SkBitmap* ContentRendererClient::GetSadPluginBitmap() { |
| 13 return nullptr; | 13 return nullptr; |
| 14 } | 14 } |
| 15 | 15 |
| 16 SkBitmap* ContentRendererClient::GetSadWebViewBitmap() { | 16 SkBitmap* ContentRendererClient::GetSadWebViewBitmap() { |
| 17 return nullptr; | 17 return nullptr; |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 162 } | 162 } |
| 163 | 163 |
| 164 bool ContentRendererClient::AllowPepperMediaStreamAPI(const GURL& url) { | 164 bool ContentRendererClient::AllowPepperMediaStreamAPI(const GURL& url) { |
| 165 return false; | 165 return false; |
| 166 } | 166 } |
| 167 | 167 |
| 168 void ContentRendererClient::AddKeySystems( | 168 void ContentRendererClient::AddKeySystems( |
| 169 std::vector<media::KeySystemInfo>* key_systems) { | 169 std::vector<media::KeySystemInfo>* key_systems) { |
| 170 } | 170 } |
| 171 | 171 |
| 172 scoped_ptr<media::Renderer> ContentRendererClient::CreateMediaRenderer( | 172 scoped_ptr<media::RendererFactory> |
| 173 RenderFrame* render_frame, | 173 ContentRendererClient::CreateMediaRendererFactory(RenderFrame* render_frame) { |
| 174 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) { | 174 return scoped_ptr<media::RendererFactory>(); |
|
scherkus (not reviewing)
2014/12/09 22:44:28
nullptr?
xhwang
2014/12/09 23:12:04
Done.
| |
| 175 return scoped_ptr<media::Renderer>(); | |
| 176 } | 175 } |
| 177 | 176 |
| 178 bool ContentRendererClient::ShouldReportDetailedMessageForSource( | 177 bool ContentRendererClient::ShouldReportDetailedMessageForSource( |
| 179 const base::string16& source) const { | 178 const base::string16& source) const { |
| 180 return false; | 179 return false; |
| 181 } | 180 } |
| 182 | 181 |
| 183 bool ContentRendererClient::ShouldEnableSiteIsolationPolicy() const { | 182 bool ContentRendererClient::ShouldEnableSiteIsolationPolicy() const { |
| 184 return true; | 183 return true; |
| 185 } | 184 } |
| (...skipping 22 matching lines...) Expand all Loading... | |
| 208 const std::string& mime_type, | 207 const std::string& mime_type, |
| 209 const GURL& original_url) { | 208 const GURL& original_url) { |
| 210 return nullptr; | 209 return nullptr; |
| 211 } | 210 } |
| 212 | 211 |
| 213 std::string ContentRendererClient::GetUserAgentOverrideForURL(const GURL& url) { | 212 std::string ContentRendererClient::GetUserAgentOverrideForURL(const GURL& url) { |
| 214 return std::string(); | 213 return std::string(); |
| 215 } | 214 } |
| 216 | 215 |
| 217 } // namespace content | 216 } // namespace content |
| OLD | NEW |