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

Unified Diff: content/renderer/media/android/webmediaplayer_android.h

Issue 887873003: media: Add DefaultMediaPermission. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/renderer/media/android/webmediaplayer_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/android/webmediaplayer_android.h
diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h
index 7d426f4b817d4dc091f03c0024f21fa47229f3aa..3ff74e056ea03c4651decf78b39656eca813ba5e 100644
--- a/content/renderer/media/android/webmediaplayer_android.h
+++ b/content/renderer/media/android/webmediaplayer_android.h
@@ -59,6 +59,7 @@ struct MailboxHolder;
namespace media {
class CdmContext;
class MediaLog;
+class MediaPermission;
class WebContentDecryptionModuleImpl;
class WebMediaPlayerDelegate;
}
@@ -89,6 +90,7 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer,
base::WeakPtr<media::WebMediaPlayerDelegate> delegate,
RendererMediaPlayerManager* player_manager,
RendererCdmManager* cdm_manager,
+ media::MediaPermission* media_permission,
blink::WebContentDecryptionModule* initial_cdm,
scoped_refptr<StreamTextureFactory> factory,
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
@@ -388,6 +390,8 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer,
// http://crbug.com/249976
RendererCdmManager* const cdm_manager_;
+ media::MediaPermission* media_permission_;
+
// Player ID assigned by the |player_manager_|.
int player_id_;
« no previous file with comments | « no previous file | content/renderer/media/android/webmediaplayer_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698