| Index: content/gpu/gpu_main.cc
|
| diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
|
| index 2bfd51f224df6a87a92185bf1c018e0078fb7736..fd93c83327723e87c49afbe236945e72e1e52d9b 100644
|
| --- a/content/gpu/gpu_main.cc
|
| +++ b/content/gpu/gpu_main.cc
|
| @@ -37,7 +37,7 @@
|
| #elif defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) && defined(USE_X11)
|
| #include "content/common/gpu/media/exynos_video_decode_accelerator.h"
|
| #include "content/common/gpu/media/omx_video_decode_accelerator.h"
|
| -#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11)
|
| +#elif defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11)
|
| #include "content/common/gpu/media/vaapi_wrapper.h"
|
| #endif
|
|
|
| @@ -321,7 +321,7 @@ void WarmUpSandbox() {
|
| ExynosVideoDecodeAccelerator::PreSandboxInitialization();
|
| else
|
| OmxVideoDecodeAccelerator::PreSandboxInitialization();
|
| -#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11)
|
| +#elif defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11)
|
| VaapiWrapper::PreSandboxInitialization();
|
| #endif
|
|
|
|
|