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

Side by Side Diff: media/blink/webmediaplayer_params.cc

Issue 887873003: media: Add DefaultMediaPermission. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 5 years, 10 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 | « media/blink/webmediaplayer_params.h ('k') | media/cdm/proxy_decryptor.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "media/blink/webmediaplayer_params.h" 5 #include "media/blink/webmediaplayer_params.h"
6 6
7 #include "base/single_thread_task_runner.h" 7 #include "base/single_thread_task_runner.h"
8 #include "media/base/audio_renderer_sink.h" 8 #include "media/base/audio_renderer_sink.h"
9 #include "media/base/media_log.h" 9 #include "media/base/media_log.h"
10 10
11 namespace media { 11 namespace media {
12 12
13 WebMediaPlayerParams::WebMediaPlayerParams( 13 WebMediaPlayerParams::WebMediaPlayerParams(
14 const DeferLoadCB& defer_load_cb, 14 const DeferLoadCB& defer_load_cb,
15 const scoped_refptr<AudioRendererSink>& audio_renderer_sink, 15 const scoped_refptr<AudioRendererSink>& audio_renderer_sink,
16 const scoped_refptr<MediaLog>& media_log, 16 const scoped_refptr<MediaLog>& media_log,
17 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, 17 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
18 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner, 18 const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner,
19 const Context3DCB& context_3d_cb, 19 const Context3DCB& context_3d_cb,
20 MediaPermission* media_permission,
20 blink::WebContentDecryptionModule* initial_cdm) 21 blink::WebContentDecryptionModule* initial_cdm)
21 : defer_load_cb_(defer_load_cb), 22 : defer_load_cb_(defer_load_cb),
22 audio_renderer_sink_(audio_renderer_sink), 23 audio_renderer_sink_(audio_renderer_sink),
23 media_log_(media_log), 24 media_log_(media_log),
24 media_task_runner_(media_task_runner), 25 media_task_runner_(media_task_runner),
25 compositor_task_runner_(compositor_task_runner), 26 compositor_task_runner_(compositor_task_runner),
26 context_3d_cb_(context_3d_cb), 27 context_3d_cb_(context_3d_cb),
28 media_permission_(media_permission),
27 initial_cdm_(initial_cdm) { 29 initial_cdm_(initial_cdm) {
28 } 30 }
29 31
30 WebMediaPlayerParams::~WebMediaPlayerParams() {} 32 WebMediaPlayerParams::~WebMediaPlayerParams() {}
31 33
32 } // namespace media 34 } // namespace media
OLDNEW
« no previous file with comments | « media/blink/webmediaplayer_params.h ('k') | media/cdm/proxy_decryptor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698