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

Unified Diff: content/browser/media/midi_dispatcher_host.cc

Issue 622793002: Group the different permission related methods in the content api. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 2 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: content/browser/media/midi_dispatcher_host.cc
diff --git a/content/browser/media/midi_dispatcher_host.cc b/content/browser/media/midi_dispatcher_host.cc
index 4d7ebff1e8ba6884f4f9a1299745c4d3b436142b..944dae51d8d2ce71187366e43451bd16d7b9d376 100644
--- a/content/browser/media/midi_dispatcher_host.cc
+++ b/content/browser/media/midi_dispatcher_host.cc
@@ -78,15 +78,17 @@ void MidiDispatcherHost::OnRequestSysExPermission(
render_process_id, render_frame_id, bridge_id);
pending_permissions_.push_back(pending_permission);
- GetContentClient()->browser()->RequestMidiSysExPermission(
+ GetContentClient()->browser()->RequestPermission(
+ PERMISSION_MIDI_SYSEX,
web_contents(),
bridge_id,
origin,
user_gesture,
base::Bind(&MidiDispatcherHost::WasSysExPermissionGranted,
weak_factory_.GetWeakPtr(),
- render_process_id, render_frame_id, bridge_id),
- &pending_permissions_.back().cancel);
+ render_process_id,
+ render_frame_id,
+ bridge_id));
}
void MidiDispatcherHost::CancelPermissionRequestsForFrame(
@@ -97,8 +99,12 @@ void MidiDispatcherHost::CancelPermissionRequestsForFrame(
for (size_t i = 0; i < pending_permissions_.size(); ++i) {
if (pending_permissions_[i].render_process_id == render_process_id &&
pending_permissions_[i].render_frame_id == render_frame_id) {
- if (!pending_permissions_[i].cancel.is_null())
- pending_permissions_[i].cancel.Run();
+ GetContentClient()->browser()->CancelPermissionRequest(
+ PERMISSION_MIDI_SYSEX,
+ web_contents(),
+ pending_permissions_[i].bridge_id,
+ render_frame_host->GetLastCommittedURL());
+
pending_permissions_.erase(pending_permissions_.begin() + i);
return;
}

Powered by Google App Engine
This is Rietveld 408576698