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

Unified Diff: media/gpu/ipc/service/media_service.cc

Issue 1882373004: Migrate content/common/gpu/media code to media/gpu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix prefix to content references in content_gpu.gypi Created 4 years, 8 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
Index: media/gpu/ipc/service/media_service.cc
diff --git a/content/common/gpu/media/media_service.cc b/media/gpu/ipc/service/media_service.cc
similarity index 78%
rename from content/common/gpu/media/media_service.cc
rename to media/gpu/ipc/service/media_service.cc
index b274589b8878491542385c92cb4d3fec3ed87e79..86580e2771d5d4b0da8f4ab7e84d2ed4f3985d0d 100644
--- a/content/common/gpu/media/media_service.cc
+++ b/media/gpu/ipc/service/media_service.cc
@@ -2,19 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/common/gpu/media/media_service.h"
+#include "media/gpu/ipc/service/media_service.h"
#include <utility>
-#include "content/common/gpu/media/gpu_video_decode_accelerator.h"
-#include "content/common/gpu/media/gpu_video_encode_accelerator.h"
-#include "content/common/gpu/media/media_channel.h"
#include "gpu/ipc/service/gpu_channel.h"
#include "gpu/ipc/service/gpu_channel_manager.h"
#include "ipc/ipc_message_macros.h"
#include "ipc/param_traits_macros.h"
+#include "media/gpu/ipc/service/gpu_video_decode_accelerator.h"
+#include "media/gpu/ipc/service/gpu_video_encode_accelerator.h"
+#include "media/gpu/ipc/service/media_channel.h"
-namespace content {
+namespace media {
MediaService::MediaService(gpu::GpuChannelManager* channel_manager)
: channel_manager_(channel_manager) {}
@@ -37,4 +37,4 @@ void MediaService::DestroyAllChannels() {
media_channels_.clear();
}
-} // namespace content
+} // namespace media

Powered by Google App Engine
This is Rietveld 408576698