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

Unified Diff: device/capture/video/video_capture_device.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 | « device/capture/video/video_capture_device.h ('k') | device/capture/video/video_capture_device_descriptor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/capture/video/video_capture_device.cc
diff --git a/media/capture/video/video_capture_device.cc b/device/capture/video/video_capture_device.cc
similarity index 81%
rename from media/capture/video/video_capture_device.cc
rename to device/capture/video/video_capture_device.cc
index 5da33f01b7c39fcde86833e000fc04a04bbfd3da..26289d7120bf1daeba1651c7177e0df06ca9516d 100644
--- a/media/capture/video/video_capture_device.cc
+++ b/device/capture/video/video_capture_device.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "media/capture/video/video_capture_device.h"
+#include "device/capture/video/video_capture_device.h"
#include "base/command_line.h"
#include "base/i18n/timezone.h"
@@ -11,7 +11,7 @@
#include "build/build_config.h"
#include "media/base/media_switches.h"
-namespace media {
+namespace device {
VideoCaptureDevice::Client::Buffer::~Buffer() {
}
@@ -22,16 +22,17 @@ VideoCaptureDevice::~VideoCaptureDevice() {
void VideoCaptureDevice::GetPhotoCapabilities(
GetPhotoCapabilitiesCallback callback) {}
-void VideoCaptureDevice::SetPhotoOptions(mojom::PhotoSettingsPtr settings,
- SetPhotoOptionsCallback callback) {}
+void VideoCaptureDevice::SetPhotoOptions(
+ media::mojom::PhotoSettingsPtr settings,
+ SetPhotoOptionsCallback callback) {}
void VideoCaptureDevice::TakePhoto(TakePhotoCallback callback) {}
-PowerLineFrequency VideoCaptureDevice::GetPowerLineFrequencyForLocation()
+media::PowerLineFrequency VideoCaptureDevice::GetPowerLineFrequencyForLocation()
const {
const std::string current_country = base::CountryCodeForCurrentTimezone();
if (current_country.empty())
- return PowerLineFrequency::FREQUENCY_DEFAULT;
+ return media::PowerLineFrequency::FREQUENCY_DEFAULT;
// Sorted out list of countries with 60Hz power line frequency, from
// http://en.wikipedia.org/wiki/Mains_electricity_by_country
const char* countries_using_60Hz[] = {
@@ -48,7 +49,7 @@ PowerLineFrequency VideoCaptureDevice::GetPowerLineFrequencyForLocation()
return media::PowerLineFrequency::FREQUENCY_60HZ;
}
-PowerLineFrequency VideoCaptureDevice::GetPowerLineFrequency(
+media::PowerLineFrequency VideoCaptureDevice::GetPowerLineFrequency(
const VideoCaptureParams& params) const {
switch (params.power_line_frequency) {
case media::PowerLineFrequency::FREQUENCY_50HZ: // fall through
@@ -59,4 +60,4 @@ PowerLineFrequency VideoCaptureDevice::GetPowerLineFrequency(
}
}
-} // namespace media
+} // namespace device
« no previous file with comments | « device/capture/video/video_capture_device.h ('k') | device/capture/video/video_capture_device_descriptor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698