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

Unified Diff: chrome/browser/media/midi_permission_context.cc

Issue 1146403004: MidiPermissionContext::GetPermission() returns BLOCK for insecure origins. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
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)) {
+ 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,

Powered by Google App Engine
This is Rietveld 408576698