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

Unified Diff: chrome/browser/media/chrome_midi_permission_context.cc

Issue 38043004: Cancel MIDI permission request infobar on MIDIAccess stop. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Delay "requests_.Remove(it.GetCurrentKey());" until we're done using |it|. Created 7 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: chrome/browser/media/chrome_midi_permission_context.cc
diff --git a/chrome/browser/media/chrome_midi_permission_context.cc b/chrome/browser/media/chrome_midi_permission_context.cc
index c23340086e9ea1e06f6963fafe3184972dcd08df..ae55f9394b4cc3e48bf9ba085daa55818e0dcccc 100644
--- a/chrome/browser/media/chrome_midi_permission_context.cc
+++ b/chrome/browser/media/chrome_midi_permission_context.cc
@@ -34,6 +34,7 @@ void ChromeMIDIPermissionContext::Shutdown() {
void ChromeMIDIPermissionContext::RequestMIDISysExPermission(
int render_process_id,
int render_view_id,
+ int bridge_id,
const GURL& requesting_frame,
const content::BrowserContext::MIDISysExPermissionCallback& callback) {
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
@@ -49,7 +50,7 @@ void ChromeMIDIPermissionContext::RequestMIDISysExPermission(
if (!web_contents)
return;
- const PermissionRequestID id(render_process_id, render_view_id, 0);
+ const PermissionRequestID id(render_process_id, render_view_id, bridge_id);
GURL embedder = web_contents->GetURL();
if (!requesting_frame.is_valid() || !embedder.is_valid()) {
@@ -63,6 +64,15 @@ void ChromeMIDIPermissionContext::RequestMIDISysExPermission(
DecidePermission(id, requesting_frame, embedder, callback);
}
+void ChromeMIDIPermissionContext::CancelMIDISysExPermissionRequest(
+ int render_process_id,
+ int render_view_id,
+ int bridge_id,
+ const GURL& requesting_frame) {
+ CancelPendingInfoBarRequest(
+ PermissionRequestID(render_process_id, render_view_id, bridge_id));
+}
+
void ChromeMIDIPermissionContext::DecidePermission(
const PermissionRequestID& id,
const GURL& requesting_frame,
@@ -129,3 +139,11 @@ PermissionQueueController* ChromeMIDIPermissionContext::GetQueueController() {
}
return permission_queue_controller_.get();
}
+
+void ChromeMIDIPermissionContext::CancelPendingInfoBarRequest(
+ const PermissionRequestID& id) {
+ DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+ if (shutting_down_)
+ return;
+ GetQueueController()->CancelInfoBarRequest(id);
+}
« no previous file with comments | « chrome/browser/media/chrome_midi_permission_context.h ('k') | chrome/browser/profiles/off_the_record_profile_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698