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

Unified Diff: device/capture/content/screen_capture_device_core.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/content/screen_capture_device_core.h ('k') | device/capture/content/smooth_event_sampler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/capture/content/screen_capture_device_core.cc
diff --git a/media/capture/content/screen_capture_device_core.cc b/device/capture/content/screen_capture_device_core.cc
similarity index 93%
rename from media/capture/content/screen_capture_device_core.cc
rename to device/capture/content/screen_capture_device_core.cc
index 0f06dfa51c5d59f4d73c3539873558ceaeb81452..e08bb5576c146b1f963e118ec5ba1e03a4090716 100644
--- a/media/capture/content/screen_capture_device_core.cc
+++ b/device/capture/content/screen_capture_device_core.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/content/screen_capture_device_core.h"
+#include "device/capture/content/screen_capture_device_core.h"
#include <memory>
#include <utility>
@@ -15,7 +15,7 @@
#include "base/strings/stringprintf.h"
#include "base/threading/thread_checker.h"
-namespace media {
+namespace device {
namespace {
@@ -46,8 +46,8 @@ void ScreenCaptureDeviceCore::AllocateAndStart(
return;
}
- if (params.requested_format.pixel_format != PIXEL_FORMAT_I420 ||
- params.requested_format.pixel_storage != PIXEL_STORAGE_CPU) {
+ if (params.requested_format.pixel_format != media::PIXEL_FORMAT_I420 ||
+ params.requested_format.pixel_storage != media::PIXEL_STORAGE_CPU) {
client->OnError(
FROM_HERE,
base::StringPrintf(
@@ -141,4 +141,4 @@ void ScreenCaptureDeviceCore::Error(const tracked_objects::Location& from_here,
TransitionStateTo(kError);
}
-} // namespace media
+} // namespace device
« no previous file with comments | « device/capture/content/screen_capture_device_core.h ('k') | device/capture/content/smooth_event_sampler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698