| Index: content/browser/renderer_host/media/midi_dispatcher_host.cc
|
| diff --git a/content/browser/renderer_host/media/midi_dispatcher_host.cc b/content/browser/renderer_host/media/midi_dispatcher_host.cc
|
| index 2181dccdd7211358a705eeafc1b7bc04c6ef797a..73b69ac3b1876ca83da7677f4b67496cb10c7bf6 100644
|
| --- a/content/browser/renderer_host/media/midi_dispatcher_host.cc
|
| +++ b/content/browser/renderer_host/media/midi_dispatcher_host.cc
|
| @@ -14,66 +14,66 @@
|
|
|
| namespace content {
|
|
|
| -MIDIDispatcherHost::MIDIDispatcherHost(int render_process_id,
|
| +MidiDispatcherHost::MidiDispatcherHost(int render_process_id,
|
| BrowserContext* browser_context)
|
| : render_process_id_(render_process_id),
|
| browser_context_(browser_context) {
|
| }
|
|
|
| -MIDIDispatcherHost::~MIDIDispatcherHost() {
|
| +MidiDispatcherHost::~MidiDispatcherHost() {
|
| }
|
|
|
| -bool MIDIDispatcherHost::OnMessageReceived(const IPC::Message& message,
|
| +bool MidiDispatcherHost::OnMessageReceived(const IPC::Message& message,
|
| bool* message_was_ok) {
|
| bool handled = true;
|
| - IPC_BEGIN_MESSAGE_MAP_EX(MIDIDispatcherHost, message, *message_was_ok)
|
| - IPC_MESSAGE_HANDLER(MIDIHostMsg_RequestSysExPermission,
|
| + IPC_BEGIN_MESSAGE_MAP_EX(MidiDispatcherHost, message, *message_was_ok)
|
| + IPC_MESSAGE_HANDLER(MidiHostMsg_RequestSysExPermission,
|
| OnRequestSysExPermission)
|
| - IPC_MESSAGE_HANDLER(MIDIHostMsg_CancelSysExPermissionRequest,
|
| + IPC_MESSAGE_HANDLER(MidiHostMsg_CancelSysExPermissionRequest,
|
| OnCancelSysExPermissionRequest)
|
| IPC_MESSAGE_UNHANDLED(handled = false)
|
| IPC_END_MESSAGE_MAP_EX()
|
| return handled;
|
| }
|
|
|
| -void MIDIDispatcherHost::OverrideThreadForMessage(
|
| +void MidiDispatcherHost::OverrideThreadForMessage(
|
| const IPC::Message& message, BrowserThread::ID* thread) {
|
| - if (IPC_MESSAGE_CLASS(message) == MIDIMsgStart)
|
| + if (IPC_MESSAGE_CLASS(message) == MidiMsgStart)
|
| *thread = BrowserThread::UI;
|
| }
|
|
|
| -void MIDIDispatcherHost::OnRequestSysExPermission(int render_view_id,
|
| +void MidiDispatcherHost::OnRequestSysExPermission(int render_view_id,
|
| int bridge_id,
|
| const GURL& origin) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
|
|
| - browser_context_->RequestMIDISysExPermission(
|
| + browser_context_->RequestMidiSysExPermission(
|
| render_process_id_,
|
| render_view_id,
|
| bridge_id,
|
| origin,
|
| - base::Bind(&MIDIDispatcherHost::WasSysExPermissionGranted,
|
| + base::Bind(&MidiDispatcherHost::WasSysExPermissionGranted,
|
| base::Unretained(this),
|
| render_view_id,
|
| bridge_id));
|
| }
|
|
|
| -void MIDIDispatcherHost::OnCancelSysExPermissionRequest(
|
| +void MidiDispatcherHost::OnCancelSysExPermissionRequest(
|
| int render_view_id,
|
| int bridge_id,
|
| const GURL& requesting_frame) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| DVLOG(1) << __FUNCTION__ << " " << render_process_id_ << ":" << render_view_id
|
| << ":" << bridge_id;
|
| - browser_context_->CancelMIDISysExPermissionRequest(
|
| + browser_context_->CancelMidiSysExPermissionRequest(
|
| render_process_id_, render_view_id, bridge_id, requesting_frame);
|
| }
|
| -void MIDIDispatcherHost::WasSysExPermissionGranted(int render_view_id,
|
| +void MidiDispatcherHost::WasSysExPermissionGranted(int render_view_id,
|
| int bridge_id,
|
| bool success) {
|
| - ChildProcessSecurityPolicyImpl::GetInstance()->GrantSendMIDISysExMessage(
|
| + ChildProcessSecurityPolicyImpl::GetInstance()->GrantSendMidiSysExMessage(
|
| render_process_id_);
|
| - Send(new MIDIMsg_SysExPermissionApproved(render_view_id, bridge_id, success));
|
| + Send(new MidiMsg_SysExPermissionApproved(render_view_id, bridge_id, success));
|
| }
|
|
|
| } // namespace content
|
|
|