OLD | NEW |
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 "content/browser/renderer_host/media/midi_dispatcher_host.h" | 5 #include "content/browser/renderer_host/media/midi_dispatcher_host.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "content/browser/child_process_security_policy_impl.h" | 8 #include "content/browser/child_process_security_policy_impl.h" |
9 #include "content/browser/renderer_host/render_view_host_impl.h" | 9 #include "content/browser/renderer_host/render_view_host_impl.h" |
10 #include "content/common/media/midi_messages.h" | 10 #include "content/common/media/midi_messages.h" |
(...skipping 27 matching lines...) Expand all Loading... |
38 } | 38 } |
39 | 39 |
40 void MidiDispatcherHost::OverrideThreadForMessage( | 40 void MidiDispatcherHost::OverrideThreadForMessage( |
41 const IPC::Message& message, BrowserThread::ID* thread) { | 41 const IPC::Message& message, BrowserThread::ID* thread) { |
42 if (IPC_MESSAGE_CLASS(message) == MidiMsgStart) | 42 if (IPC_MESSAGE_CLASS(message) == MidiMsgStart) |
43 *thread = BrowserThread::UI; | 43 *thread = BrowserThread::UI; |
44 } | 44 } |
45 | 45 |
46 void MidiDispatcherHost::OnRequestSysExPermission(int render_view_id, | 46 void MidiDispatcherHost::OnRequestSysExPermission(int render_view_id, |
47 int bridge_id, | 47 int bridge_id, |
48 const GURL& origin) { | 48 const GURL& origin, |
| 49 bool user_gesture) { |
49 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 50 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
50 | 51 |
51 browser_context_->RequestMidiSysExPermission( | 52 browser_context_->RequestMidiSysExPermission( |
52 render_process_id_, | 53 render_process_id_, |
53 render_view_id, | 54 render_view_id, |
54 bridge_id, | 55 bridge_id, |
55 origin, | 56 origin, |
| 57 user_gesture, |
56 base::Bind(&MidiDispatcherHost::WasSysExPermissionGranted, | 58 base::Bind(&MidiDispatcherHost::WasSysExPermissionGranted, |
57 base::Unretained(this), | 59 base::Unretained(this), |
58 render_view_id, | 60 render_view_id, |
59 bridge_id)); | 61 bridge_id)); |
60 } | 62 } |
61 | 63 |
62 void MidiDispatcherHost::OnCancelSysExPermissionRequest( | 64 void MidiDispatcherHost::OnCancelSysExPermissionRequest( |
63 int render_view_id, | 65 int render_view_id, |
64 int bridge_id, | 66 int bridge_id, |
65 const GURL& requesting_frame) { | 67 const GURL& requesting_frame) { |
66 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 68 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
67 DVLOG(1) << __FUNCTION__ << " " << render_process_id_ << ":" << render_view_id | 69 DVLOG(1) << __FUNCTION__ << " " << render_process_id_ << ":" << render_view_id |
68 << ":" << bridge_id; | 70 << ":" << bridge_id; |
69 browser_context_->CancelMidiSysExPermissionRequest( | 71 browser_context_->CancelMidiSysExPermissionRequest( |
70 render_process_id_, render_view_id, bridge_id, requesting_frame); | 72 render_process_id_, render_view_id, bridge_id, requesting_frame); |
71 } | 73 } |
72 void MidiDispatcherHost::WasSysExPermissionGranted(int render_view_id, | 74 void MidiDispatcherHost::WasSysExPermissionGranted(int render_view_id, |
73 int bridge_id, | 75 int bridge_id, |
74 bool success) { | 76 bool success) { |
75 ChildProcessSecurityPolicyImpl::GetInstance()->GrantSendMidiSysExMessage( | 77 ChildProcessSecurityPolicyImpl::GetInstance()->GrantSendMidiSysExMessage( |
76 render_process_id_); | 78 render_process_id_); |
77 Send(new MidiMsg_SysExPermissionApproved(render_view_id, bridge_id, success)); | 79 Send(new MidiMsg_SysExPermissionApproved(render_view_id, bridge_id, success)); |
78 } | 80 } |
79 | 81 |
80 } // namespace content | 82 } // namespace content |
OLD | NEW |