chrome/browser/media/media_capture_devices_dispatcher.cc - Issue 282693002: Add a null check for PermissionBubbleManager::FromWebcontents.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 282693002: Add a null check for PermissionBubbleManager::FromWebcontents. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 7 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

« no previous file with comments | « chrome/browser/media/chrome_midi_permission_context.cc ('k') | chrome/browser/notifications/desktop_notification_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/media_capture_devices_dispatcher.cc

diff --git a/chrome/browser/media/media_capture_devices_dispatcher.cc b/chrome/browser/media/media_capture_devices_dispatcher.cc

index 0c66018bb3f111b19681930521bd237ab7372659..83562dc48f4f286f01132992f12907f52acf568b 100644

--- a/chrome/browser/media/media_capture_devices_dispatcher.cc

+++ b/chrome/browser/media/media_capture_devices_dispatcher.cc

@@ -75,7 +75,7 @@ const content::MediaStreamDevice* FindDeviceWithId(

}

return NULL;

-};

// This is a short-term solution to grant camera and/or microphone access to

// extensions:

@@ -631,8 +631,10 @@ void MediaCaptureDevicesDispatcher::ProcessQueuedAccessRequest(

base::Unretained(this), web_contents)));

if (controller->DismissInfoBarAndTakeActionOnSettings())

return;

- PermissionBubbleManager::FromWebContents(web_contents)->

- AddRequest(controller.release());

+ PermissionBubbleManager* bubble_manager =

+ PermissionBubbleManager::FromWebContents(web_contents);

+ if (bubble_manager)

+ bubble_manager->AddRequest(controller.release());

return;

}