media/capture/video/win/video_capture_device_factory_win.cc - Issue 2068763002: Re-Reland: Make media/capture gn and gyps produce components

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

Issue 2068763002: Re-Reland: Make media/capture gn and gyps produce components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Disable warning 4267 in Win capture.gyp (probs. lost in the previous relanding). Rebase Created 4 years, 6 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

« media/capture/video/win/filter_base_win.cc ('K') | « media/capture/video/win/video_capture_device_factory_win.h ('k') | media/capture/video/win/video_capture_device_mf_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 3c3bf3155fa1df27c944557ca181468d34901295..6c5ee5fb010dd6a5ccbdf09b36a2114b1c21e8f8 100644

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

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

@@ -114,7 +114,8 @@ static bool IsDeviceBlackListed(const std::string& name) {

if (base::StartsWith(name, kBlacklistedCameraNames[i],

base::CompareCase::INSENSITIVE_ASCII)) {

DVLOG(1) << "Enumerated blacklisted device: " << name;

- UMA_HISTOGRAM_ENUMERATION("Media.VideoCapture.BlacklistedDevice", i,

+ UMA_HISTOGRAM_ENUMERATION("Media.VideoCapture.BlacklistedDevice",

+ static_cast<int32_t>(i),

BLACKLISTED_CAMERA_MAX + 1);

return true;

}