Index: content/common/gpu/media/gpu_video_decode_accelerator.cc |
diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.cc b/content/common/gpu/media/gpu_video_decode_accelerator.cc |
index 1d9afd4526417a94da737656ee7b3d8cf3ce2a50..863e6a711848ec8bb3efc712e7021f2b1cb838ea 100644 |
--- a/content/common/gpu/media/gpu_video_decode_accelerator.cc |
+++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc |
@@ -26,7 +26,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 "ui/gl/gl_context_glx.h" |
#include "content/common/gpu/media/vaapi_video_decode_accelerator.h" |
#elif defined(OS_ANDROID) |
@@ -191,7 +191,7 @@ void GpuVideoDecodeAccelerator::Initialize( |
this, |
make_context_current_)); |
} |
-#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11) |
+#elif defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11) |
gfx::GLContextGLX* glx_context = |
static_cast<gfx::GLContextGLX*>(stub_->decoder()->GetGLContext()); |
GLXContext glx_context_handle = |