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

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

Issue 2032923002: [Chromecast] Make EME persistent license support optional (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
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::AddSupportedKeySystems( 103 void CastContentRendererClient::AddSupportedKeySystems(
104 std::vector<std::unique_ptr<::media::KeySystemProperties>>* 104 std::vector<std::unique_ptr<::media::KeySystemProperties>>*
105 key_systems_properties) { 105 key_systems_properties) {
106 AddChromecastKeySystems(key_systems_properties); 106 AddChromecastKeySystems(key_systems_properties, false);
107 } 107 }
108 108
109 #if !defined(OS_ANDROID) 109 #if !defined(OS_ANDROID)
110 std::unique_ptr<::media::RendererFactory> 110 std::unique_ptr<::media::RendererFactory>
111 CastContentRendererClient::CreateMediaRendererFactory( 111 CastContentRendererClient::CreateMediaRendererFactory(
112 ::content::RenderFrame* render_frame, 112 ::content::RenderFrame* render_frame,
113 ::media::GpuVideoAcceleratorFactories* gpu_factories, 113 ::media::GpuVideoAcceleratorFactories* gpu_factories,
114 const scoped_refptr<::media::MediaLog>& media_log) { 114 const scoped_refptr<::media::MediaLog>& media_log) {
115 const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); 115 const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
116 if (!cmd_line->HasSwitch(switches::kEnableCmaMediaPipeline)) 116 if (!cmd_line->HasSwitch(switches::kEnableCmaMediaPipeline))
(...skipping 18 matching lines...) Expand all
135 closure.Run(); 135 closure.Run();
136 return; 136 return;
137 } 137 }
138 138
139 // Lifetime is tied to |render_frame| via content::RenderFrameObserver. 139 // Lifetime is tied to |render_frame| via content::RenderFrameObserver.
140 new CastMediaLoadDeferrer(render_frame, closure); 140 new CastMediaLoadDeferrer(render_frame, closure);
141 } 141 }
142 142
143 } // namespace shell 143 } // namespace shell
144 } // namespace chromecast 144 } // namespace chromecast
OLDNEW
« no previous file with comments | « no previous file | chromecast/renderer/key_systems_cast.h » ('j') | chromecast/renderer/key_systems_cast.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698