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

Side by Side Diff: components/html_viewer/media_factory.cc

Issue 1165633004: media: Add MojoCdmServiceContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments addressed Created 5 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
« no previous file with comments | « no previous file | media/base/cdm_context.h » ('j') | media/base/cdm_context.h » ('J')
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 "components/html_viewer/media_factory.h" 5 #include "components/html_viewer/media_factory.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 } 169 }
170 170
171 media_service_provider_.reset( 171 media_service_provider_.reset(
172 new MojoMediaServiceProvider(mojo_service_provider_ptr_.get())); 172 new MojoMediaServiceProvider(mojo_service_provider_ptr_.get()));
173 } 173 }
174 174
175 return media_service_provider_.get(); 175 return media_service_provider_.get();
176 } 176 }
177 177
178 media::MediaPermission* MediaFactory::GetMediaPermission() { 178 media::MediaPermission* MediaFactory::GetMediaPermission() {
179 // TODO(xhwang): Replace DefaultMediaPermission with something real when
ddorwin 2015/06/08 18:33:09 Add NOTIMPLEMENTED?
xhwang 2015/06/08 22:12:33 Done.
180 // permissions are supported in html_viewer.
179 if (!media_permission_) 181 if (!media_permission_)
180 media_permission_.reset(new media::DefaultMediaPermission(true)); 182 media_permission_.reset(new media::DefaultMediaPermission(true));
181 return media_permission_.get(); 183 return media_permission_.get();
182 } 184 }
183 185
184 media::CdmFactory* MediaFactory::GetCdmFactory() { 186 media::CdmFactory* MediaFactory::GetCdmFactory() {
185 if (!cdm_factory_) 187 if (!cdm_factory_)
186 cdm_factory_.reset(new media::DefaultCdmFactory()); 188 cdm_factory_.reset(new media::DefaultCdmFactory());
187 return cdm_factory_.get(); 189 return cdm_factory_.get();
188 } 190 }
(...skipping 13 matching lines...) Expand all
202 scoped_refptr<base::SingleThreadTaskRunner> 204 scoped_refptr<base::SingleThreadTaskRunner>
203 MediaFactory::GetMediaThreadTaskRunner() { 205 MediaFactory::GetMediaThreadTaskRunner() {
204 if (!media_thread_.IsRunning()) 206 if (!media_thread_.IsRunning())
205 media_thread_.Start(); 207 media_thread_.Start();
206 208
207 return media_thread_.task_runner(); 209 return media_thread_.task_runner();
208 } 210 }
209 #endif // !defined(OS_ANDROID) 211 #endif // !defined(OS_ANDROID)
210 212
211 } // namespace html_viewer 213 } // namespace html_viewer
OLDNEW
« no previous file with comments | « no previous file | media/base/cdm_context.h » ('j') | media/base/cdm_context.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698