| Index: content/renderer/media/midi_dispatcher.cc
|
| diff --git a/content/renderer/media/midi_dispatcher.cc b/content/renderer/media/midi_dispatcher.cc
|
| index 1f04e3e22f8f0262d4343a31b4d7886f737e9b72..a7c0679a449bce55c591999020f85eb0c4b36f1c 100644
|
| --- a/content/renderer/media/midi_dispatcher.cc
|
| +++ b/content/renderer/media/midi_dispatcher.cc
|
| @@ -16,32 +16,32 @@ using blink::WebSecurityOrigin;
|
|
|
| namespace content {
|
|
|
| -MIDIDispatcher::MIDIDispatcher(RenderViewImpl* render_view)
|
| +MidiDispatcher::MidiDispatcher(RenderViewImpl* render_view)
|
| : RenderViewObserver(render_view) {
|
| }
|
|
|
| -MIDIDispatcher::~MIDIDispatcher() {}
|
| +MidiDispatcher::~MidiDispatcher() {}
|
|
|
| -bool MIDIDispatcher::OnMessageReceived(const IPC::Message& message) {
|
| +bool MidiDispatcher::OnMessageReceived(const IPC::Message& message) {
|
| bool handled = true;
|
| - IPC_BEGIN_MESSAGE_MAP(MIDIDispatcher, message)
|
| - IPC_MESSAGE_HANDLER(MIDIMsg_SysExPermissionApproved,
|
| + IPC_BEGIN_MESSAGE_MAP(MidiDispatcher, message)
|
| + IPC_MESSAGE_HANDLER(MidiMsg_SysExPermissionApproved,
|
| OnSysExPermissionApproved)
|
| IPC_MESSAGE_UNHANDLED(handled = false)
|
| IPC_END_MESSAGE_MAP()
|
| return handled;
|
| }
|
|
|
| -void MIDIDispatcher::requestSysExPermission(
|
| +void MidiDispatcher::requestSysExPermission(
|
| const WebMIDIPermissionRequest& request) {
|
| int bridge_id = requests_.Add(new WebMIDIPermissionRequest(request));
|
| WebSecurityOrigin security_origin = request.securityOrigin();
|
| std::string origin = security_origin.toString().utf8();
|
| GURL url(origin);
|
| - Send(new MIDIHostMsg_RequestSysExPermission(routing_id(), bridge_id, url));
|
| + Send(new MidiHostMsg_RequestSysExPermission(routing_id(), bridge_id, url));
|
| }
|
|
|
| -void MIDIDispatcher::cancelSysExPermissionRequest(
|
| +void MidiDispatcher::cancelSysExPermissionRequest(
|
| const WebMIDIPermissionRequest& request) {
|
| for (IDMap<WebMIDIPermissionRequest>::iterator it(&requests_);
|
| !it.IsAtEnd();
|
| @@ -49,7 +49,7 @@ void MIDIDispatcher::cancelSysExPermissionRequest(
|
| WebMIDIPermissionRequest* value = it.GetCurrentValue();
|
| if (value->equals(request)) {
|
| base::string16 origin = request.securityOrigin().toString();
|
| - Send(new MIDIHostMsg_CancelSysExPermissionRequest(
|
| + Send(new MidiHostMsg_CancelSysExPermissionRequest(
|
| routing_id(), it.GetCurrentKey(), GURL(origin)));
|
| requests_.Remove(it.GetCurrentKey());
|
| break;
|
| @@ -57,7 +57,8 @@ void MIDIDispatcher::cancelSysExPermissionRequest(
|
| }
|
| }
|
|
|
| -void MIDIDispatcher::OnSysExPermissionApproved(int bridge_id, bool is_allowed) {
|
| +void MidiDispatcher::OnSysExPermissionApproved(int bridge_id,
|
| + bool is_allowed) {
|
| // |request| can be NULL when the request is canceled.
|
| WebMIDIPermissionRequest* request = requests_.Lookup(bridge_id);
|
| if (!request)
|
|
|