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

Unified Diff: content/gpu/gpu_main.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 several more bot-identified build issues 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: content/gpu/gpu_main.cc
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index 3dfba0cc5307e0822001e879c1406de1e21f4955..6103261636884a82f0c16c062988f93e2ac48467 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -56,7 +56,7 @@
#if defined(OS_WIN)
#include "base/win/windows_version.h"
#include "base/win/scoped_com_initializer.h"
-#include "content/common/gpu/media/dxva_video_decode_accelerator_win.h"
+#include "media/gpu/dxva_video_decode_accelerator_win.h"
#include "sandbox/win/src/sandbox.h"
#endif
@@ -75,7 +75,7 @@
#endif
#if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
-#include "content/common/gpu/media/vaapi_wrapper.h"
+#include "media/gpu/vaapi_wrapper.h"
#endif
#if defined(SANITIZER_COVERAGE)
@@ -246,7 +246,7 @@ int GpuMain(const MainFunctionParams& parameters) {
gpu_info.in_process_gpu = false;
#if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
- VaapiWrapper::PreSandboxInitialization();
+ media::VaapiWrapper::PreSandboxInitialization();
#endif
#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
@@ -453,7 +453,7 @@ bool WarmUpSandbox(const base::CommandLine& command_line) {
}
#if defined(OS_WIN)
- content::DXVAVideoDecodeAccelerator::PreSandboxInitialization();
+ media::DXVAVideoDecodeAccelerator::PreSandboxInitialization();
#endif
return true;
}

Powered by Google App Engine
This is Rietveld 408576698