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

Unified Diff: chrome/browser/media/media_permission.h

Issue 1318173002: Integrate MediaPermission with PermissionManager by using PermissionContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 | chrome/browser/media/media_permission.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media/media_permission.h
diff --git a/chrome/browser/media/media_permission.h b/chrome/browser/media/media_permission.h
index 400a3ca35227702ed78c227fe3d42a769fe82acd..dfd01cbbb686deb7b943703607121e97a60be98d 100644
--- a/chrome/browser/media/media_permission.h
+++ b/chrome/browser/media/media_permission.h
@@ -19,7 +19,8 @@ class MediaPermission {
public:
MediaPermission(ContentSettingsType content_type,
content::MediaStreamRequestType request_type,
- const GURL& origin,
+ const GURL& requesting_origin,
+ const GURL& embedding_origin,
Profile* profile);
// Returns the status of the permission. If the setting is
@@ -40,7 +41,8 @@ class MediaPermission {
const ContentSettingsType content_type_;
const content::MediaStreamRequestType request_type_;
- const GURL origin_;
+ const GURL requesting_origin_;
+ const GURL embedding_origin_;
const std::string device_id_;
Profile* const profile_;
« no previous file with comments | « no previous file | chrome/browser/media/media_permission.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698