media/video/capture/win/video_capture_device_factory_win.cc - Issue 985853005: base: Remove operator& from ScopedVariant and ScopedPropVariant.

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: media/video/capture/win/video_capture_device_factory_win.cc

Issue 985853005: base: Remove operator& from ScopedVariant and ScopedPropVariant. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: scoped-operator: prop-ptr Created 5 years, 9 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 | « content/browser/accessibility/accessibility_win_browsertest.cc ('k') | media/video/capture/win/video_capture_device_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/video/capture/win/video_capture_device_factory_win.cc

diff --git a/media/video/capture/win/video_capture_device_factory_win.cc b/media/video/capture/win/video_capture_device_factory_win.cc

index 4e39c6e2b86c51020a406cffac062c316deb3e90..f2544455ce34da5d9f91e3362deb236720e0b3cb 100644

--- a/media/video/capture/win/video_capture_device_factory_win.cc

+++ b/media/video/capture/win/video_capture_device_factory_win.cc

@@ -165,7 +165,7 @@ static void GetDeviceNamesDirectShow(

if (FAILED(hr) || name.type() != VT_BSTR)

continue;

- const std::string device_name(base::SysWideToUTF8(V_BSTR(&name)));

+ const std::string device_name(base::SysWideToUTF8(V_BSTR(name.ptr())));

if (IsDeviceBlackListed(device_name))

continue;

@@ -176,7 +176,7 @@ static void GetDeviceNamesDirectShow(

id = device_name;

} else {

DCHECK_EQ(name.type(), VT_BSTR);

- id = base::SysWideToUTF8(V_BSTR(&name));

+ id = base::SysWideToUTF8(V_BSTR(name.ptr()));

}

device_names->push_back(Name(device_name, id, capture_api_type));

}