chrome/browser/extensions/api/tab_capture/offscreen_tab.cc - Issue 1871713002: Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr

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/extensions/api/tab_capture/offscreen_tab.cc

Issue 1871713002: Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase and fix header Created 4 years, 8 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/extensions/api/tab_capture/offscreen_tab.h ('k') | chrome/browser/extensions/api/tab_capture/tab_capture_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/tab_capture/offscreen_tab.cc

diff --git a/chrome/browser/extensions/api/tab_capture/offscreen_tab.cc b/chrome/browser/extensions/api/tab_capture/offscreen_tab.cc

index 93d8363db02bc17791ed3b11449246d058190119..9e00054015d4ff2e4434871bf4e74a146a511837 100644

--- a/chrome/browser/extensions/api/tab_capture/offscreen_tab.cc

+++ b/chrome/browser/extensions/api/tab_capture/offscreen_tab.cc

@@ -388,11 +388,9 @@ void OffscreenTab::RequestMediaAccessPermission(

DVLOG(2) << "Allowing " << devices.size()

<< " capture devices for OffscreenTab content.";

- callback.Run(

- devices,

- devices.empty() ? content::MEDIA_DEVICE_INVALID_STATE :

- content::MEDIA_DEVICE_OK,

- scoped_ptr<content::MediaStreamUI>(nullptr));

+ callback.Run(devices, devices.empty() ? content::MEDIA_DEVICE_INVALID_STATE

+ : content::MEDIA_DEVICE_OK,

+ std::unique_ptr<content::MediaStreamUI>(nullptr));

}

bool OffscreenTab::CheckMediaAccessPermission(