Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2083)

Unified Diff: content/browser/media/media_internals.cc

Issue 2214533002: move //media/capture to //device/capture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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/media/media_internals.h ('k') | content/browser/media/media_internals_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media/media_internals.cc
diff --git a/content/browser/media/media_internals.cc b/content/browser/media/media_internals.cc
index 3ef867386b38ba2c1d3df7d8e3b1e29f5092261b..80b1ebdc55d1d622d8a749c2db568bd558bf1090 100644
--- a/content/browser/media/media_internals.cc
+++ b/content/browser/media/media_internals.cc
@@ -600,7 +600,7 @@ void MediaInternals::SendVideoCaptureDeviceCapabilities() {
}
void MediaInternals::UpdateVideoCaptureDeviceCapabilities(
- const std::vector<std::tuple<media::VideoCaptureDeviceDescriptor,
+ const std::vector<std::tuple<device::VideoCaptureDeviceDescriptor,
media::VideoCaptureFormats>>&
descriptors_and_formats) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ -612,7 +612,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilities(
// parsed by the javascript handler, is brittle. Consider passing
// a list of mappings instead.
- const media::VideoCaptureDeviceDescriptor& descriptor =
+ const device::VideoCaptureDeviceDescriptor& descriptor =
std::get<0>(device_format_pair);
const media::VideoCaptureFormats& supported_formats =
std::get<1>(device_format_pair);
« no previous file with comments | « content/browser/media/media_internals.h ('k') | content/browser/media/media_internals_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698