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

Issues Search
    My Issues | Starred     Open | Closed | All

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 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
« no previous file with comments | « content/gpu/gpu_child_thread.cc ('k') | content/public/gpu/BUILD.gn » ('j') | media/gpu/media_gpu_export.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/gpu/gpu_main.cc
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index a24a1f4b185a0e1ef6e8a5c7e1e7f94b57ed5712..418b14d945d02a978eed56582f257023f2ec78b3 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)
@@ -247,7 +247,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)
« no previous file with comments | « content/gpu/gpu_child_thread.cc ('k') | content/public/gpu/BUILD.gn » ('j') | media/gpu/media_gpu_export.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698