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

Side by Side Diff: chromecast/renderer/cast_content_renderer_client.cc

Issue 2478453002: [Chromecast] Use CdmConfig to create CDM (Closed)
Patch Set: Created 4 years, 1 month 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
« no previous file with comments | « chromecast/media/cdm/cast_cdm_factory.cc ('k') | chromecast/renderer/key_systems_cast.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chromecast/renderer/cast_content_renderer_client.h" 5 #include "chromecast/renderer/cast_content_renderer_client.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <string> 8 #include <string>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 110
111 // Disable application cache as Chromecast doesn't support off-line 111 // Disable application cache as Chromecast doesn't support off-line
112 // application running. 112 // application running.
113 webview->settings()->setOfflineWebApplicationCacheEnabled(false); 113 webview->settings()->setOfflineWebApplicationCacheEnabled(false);
114 } 114 }
115 } 115 }
116 116
117 void CastContentRendererClient::AddSupportedKeySystems( 117 void CastContentRendererClient::AddSupportedKeySystems(
118 std::vector<std::unique_ptr<::media::KeySystemProperties>>* 118 std::vector<std::unique_ptr<::media::KeySystemProperties>>*
119 key_systems_properties) { 119 key_systems_properties) {
120 AddChromecastKeySystems(key_systems_properties, false); 120 AddChromecastKeySystems(key_systems_properties,
121 false /* enable_persisten_license_support */,
halliwell 2016/11/03 18:51:48 'persistent'
122 false /* force_software_crypto */);
121 } 123 }
122 124
123 blink::WebPrescientNetworking* 125 blink::WebPrescientNetworking*
124 CastContentRendererClient::GetPrescientNetworking() { 126 CastContentRendererClient::GetPrescientNetworking() {
125 return prescient_networking_dispatcher_.get(); 127 return prescient_networking_dispatcher_.get();
126 } 128 }
127 129
128 void CastContentRendererClient::DeferMediaLoad( 130 void CastContentRendererClient::DeferMediaLoad(
129 content::RenderFrame* render_frame, 131 content::RenderFrame* render_frame,
130 bool render_frame_has_played_media_before, 132 bool render_frame_has_played_media_before,
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 174
173 void ExecuteJavaScript(content::RenderFrame* render_frame, int resource_id) { 175 void ExecuteJavaScript(content::RenderFrame* render_frame, int resource_id) {
174 const std::string& js_string = ui::ResourceBundle::GetSharedInstance() 176 const std::string& js_string = ui::ResourceBundle::GetSharedInstance()
175 .GetRawDataResource(resource_id) 177 .GetRawDataResource(resource_id)
176 .as_string(); 178 .as_string();
177 render_frame->ExecuteJavaScript(base::UTF8ToUTF16(js_string)); 179 render_frame->ExecuteJavaScript(base::UTF8ToUTF16(js_string));
178 } 180 }
179 181
180 } // namespace shell 182 } // namespace shell
181 } // namespace chromecast 183 } // namespace chromecast
OLDNEW
« no previous file with comments | « chromecast/media/cdm/cast_cdm_factory.cc ('k') | chromecast/renderer/key_systems_cast.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698