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

Side by Side 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 unified diff | Download patch
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 "chrome/browser/media/midi_permission_context.h" 5 #include "chrome/browser/media/midi_permission_context.h"
6 6
7 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 7 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
8 #include "components/content_settings/core/common/permission_request_id.h" 8 #include "components/content_settings/core/common/permission_request_id.h"
9 #include "content/public/browser/child_process_security_policy.h" 9 #include "content/public/browser/child_process_security_policy.h"
10 #include "content/public/common/origin_util.h"
10 #include "url/gurl.h" 11 #include "url/gurl.h"
11 12
12 MidiPermissionContext::MidiPermissionContext(Profile* profile) 13 MidiPermissionContext::MidiPermissionContext(Profile* profile)
13 : PermissionContextBase(profile, CONTENT_SETTINGS_TYPE_MIDI_SYSEX) { 14 : PermissionContextBase(profile, CONTENT_SETTINGS_TYPE_MIDI_SYSEX) {
14 } 15 }
15 16
16 MidiPermissionContext::~MidiPermissionContext() { 17 MidiPermissionContext::~MidiPermissionContext() {
17 } 18 }
18 19
20 ContentSetting MidiPermissionContext::GetPermissionStatus(
21 const GURL& requesting_origin,
22 const GURL& embedding_origin) const {
23 if (requesting_origin.is_valid() &&
24 !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
25 return CONTENT_SETTING_BLOCK;
26 }
27
28 return PermissionContextBase::GetPermissionStatus(requesting_origin,
29 embedding_origin);
30 }
31
32 void MidiPermissionContext::DecidePermission(
33 content::WebContents* web_contents,
34 const PermissionRequestID& id,
35 const GURL& requesting_origin,
36 const GURL& embedding_origin,
37 bool user_gesture,
38 const BrowserPermissionCallback& callback) {
39 if (requesting_origin.is_valid() &&
40 !content::IsOriginSecure(requesting_origin)) {
41 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
42 false /* persist */, CONTENT_SETTING_BLOCK);
43 return;
44 }
45
46 PermissionContextBase::DecidePermission(
47 web_contents, id, requesting_origin,
48 embedding_origin, user_gesture, callback);
49 }
19 50
20 void MidiPermissionContext::UpdateTabContext(const PermissionRequestID& id, 51 void MidiPermissionContext::UpdateTabContext(const PermissionRequestID& id,
21 const GURL& requesting_frame, 52 const GURL& requesting_frame,
22 bool allowed) { 53 bool allowed) {
23 TabSpecificContentSettings* content_settings = 54 TabSpecificContentSettings* content_settings =
24 TabSpecificContentSettings::Get(id.render_process_id(), 55 TabSpecificContentSettings::Get(id.render_process_id(),
25 id.render_view_id()); 56 id.render_view_id());
26 if (!content_settings) 57 if (!content_settings)
27 return; 58 return;
28 59
29 if (allowed) { 60 if (allowed) {
30 content_settings->OnMidiSysExAccessed(requesting_frame); 61 content_settings->OnMidiSysExAccessed(requesting_frame);
31 62
32 content::ChildProcessSecurityPolicy::GetInstance()-> 63 content::ChildProcessSecurityPolicy::GetInstance()->
33 GrantSendMidiSysExMessage(id.render_process_id()); 64 GrantSendMidiSysExMessage(id.render_process_id());
34 } else { 65 } else {
35 content_settings->OnMidiSysExAccessBlocked(requesting_frame); 66 content_settings->OnMidiSysExAccessBlocked(requesting_frame);
36 } 67 }
37 } 68 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698