chrome/browser/media/media_capture_devices_dispatcher.cc - Issue 610093002: Revert "Tempolarily exclude extensions API that are causing crash on Athena"

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 610093002: Revert "Tempolarily exclude extensions API that are causing crash on Athena" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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/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 cb66264721870df128777548397367b619c33516..7982a8254fbd776bc013cbda1fb167dcb3ce8ff0 100644

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

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

@@ -654,7 +654,7 @@ void MediaCaptureDevicesDispatcher::ProcessTabCaptureAccessRequest(

content::MediaStreamDevices devices;

scoped_ptr<content::MediaStreamUI> ui;

-#if defined(ENABLE_EXTENSIONS) && !defined(USE_ATHENA)

+#if defined(ENABLE_EXTENSIONS)

Profile* profile =

Profile::FromBrowserContext(web_contents->GetBrowserContext());

extensions::TabCaptureRegistry* tab_capture_registry =

« no previous file with comments | « chrome/browser/extensions/browser_context_keyed_service_factories.cc ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »