Chromium Code Reviews| Index: chrome/browser/media/midi_permission_context.cc |
| diff --git a/chrome/browser/media/midi_permission_context.cc b/chrome/browser/media/midi_permission_context.cc |
| index 715447d53907ff50c8b9855aa2ca408e9164eb5c..95cffbb0fa7a99d0e5f27f806492e75380598baf 100644 |
| --- a/chrome/browser/media/midi_permission_context.cc |
| +++ b/chrome/browser/media/midi_permission_context.cc |
| @@ -7,6 +7,7 @@ |
| #include "chrome/browser/content_settings/tab_specific_content_settings.h" |
| #include "components/content_settings/core/common/permission_request_id.h" |
| #include "content/public/browser/child_process_security_policy.h" |
| +#include "content/public/common/origin_util.h" |
| #include "url/gurl.h" |
| MidiPermissionContext::MidiPermissionContext(Profile* profile) |
| @@ -16,6 +17,36 @@ MidiPermissionContext::MidiPermissionContext(Profile* profile) |
| MidiPermissionContext::~MidiPermissionContext() { |
| } |
| +ContentSetting MidiPermissionContext::GetPermissionStatus( |
| + const GURL& requesting_origin, |
| + const GURL& embedding_origin) const { |
| + if (requesting_origin.is_valid() && |
| + !content::IsOriginSecure(requesting_origin)) { |
|
ddorwin
2015/05/22 16:18:59
This is something we'll probably have to deal with
mlamouri (slow - plz ping)
2015/05/22 18:15:59
I would happily do that when there will be more th
ddorwin
2015/05/22 19:57:53
OOC, what other permissions are checked at the Bli
|
| + return CONTENT_SETTING_BLOCK; |
| + } |
| + |
| + return PermissionContextBase::GetPermissionStatus(requesting_origin, |
| + embedding_origin); |
| +} |
| + |
| +void MidiPermissionContext::DecidePermission( |
| + content::WebContents* web_contents, |
| + const PermissionRequestID& id, |
| + const GURL& requesting_origin, |
| + const GURL& embedding_origin, |
| + bool user_gesture, |
| + const BrowserPermissionCallback& callback) { |
| + if (requesting_origin.is_valid() && |
| + !content::IsOriginSecure(requesting_origin)) { |
| + NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, |
| + false /* persist */, CONTENT_SETTING_BLOCK); |
| + return; |
| + } |
| + |
| + PermissionContextBase::DecidePermission( |
| + web_contents, id, requesting_origin, |
| + embedding_origin, user_gesture, callback); |
| +} |
| void MidiPermissionContext::UpdateTabContext(const PermissionRequestID& id, |
| const GURL& requesting_frame, |