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

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

Issue 1926533002: Convert Widevine and Android platform key systems to KeySystemProperties (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Few small cleanups Created 4 years, 7 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 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 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 webview->setInitialPageScaleOverride(1.f); 95 webview->setInitialPageScaleOverride(1.f);
96 96
97 // Disable application cache as Chromecast doesn't support off-line 97 // Disable application cache as Chromecast doesn't support off-line
98 // application running. 98 // application running.
99 webview->settings()->setOfflineWebApplicationCacheEnabled(false); 99 webview->settings()->setOfflineWebApplicationCacheEnabled(false);
100 } 100 }
101 } 101 }
102 102
103 void CastContentRendererClient::AddKeySystems( 103 void CastContentRendererClient::AddKeySystems(
104 std::vector< ::media::KeySystemInfo>* key_systems) { 104 std::vector< ::media::KeySystemInfo>* key_systems) {
105 AddChromecastKeySystemsInfo(key_systems);
106 }
107
108 void CastContentRendererClient::AddSupportedKeySystems(
109 std::vector<std::unique_ptr<::media::KeySystemProperties>>* key_systems) {
105 AddChromecastKeySystems(key_systems); 110 AddChromecastKeySystems(key_systems);
106 } 111 }
107 112
108 #if !defined(OS_ANDROID) 113 #if !defined(OS_ANDROID)
109 std::unique_ptr<::media::RendererFactory> 114 std::unique_ptr<::media::RendererFactory>
110 CastContentRendererClient::CreateMediaRendererFactory( 115 CastContentRendererClient::CreateMediaRendererFactory(
111 ::content::RenderFrame* render_frame, 116 ::content::RenderFrame* render_frame,
112 ::media::GpuVideoAcceleratorFactories* gpu_factories, 117 ::media::GpuVideoAcceleratorFactories* gpu_factories,
113 const scoped_refptr<::media::MediaLog>& media_log) { 118 const scoped_refptr<::media::MediaLog>& media_log) {
114 const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); 119 const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
(...skipping 19 matching lines...) Expand all
134 closure.Run(); 139 closure.Run();
135 return; 140 return;
136 } 141 }
137 142
138 // Lifetime is tied to |render_frame| via content::RenderFrameObserver. 143 // Lifetime is tied to |render_frame| via content::RenderFrameObserver.
139 new CastMediaLoadDeferrer(render_frame, closure); 144 new CastMediaLoadDeferrer(render_frame, closure);
140 } 145 }
141 146
142 } // namespace shell 147 } // namespace shell
143 } // namespace chromecast 148 } // namespace chromecast
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698