1 --- chromium-browser-33.0.1750.146/content/common/gpu/media/gpu_video_decode_accelerator.cc~ 2014-02-20 21:28:24.000000000 +0100
2 +++ chromium-browser-33.0.1750.146/content/common/gpu/media/gpu_video_decode_accelerator.cc 2014-03-12 16:52:52.265999592 +0100
4 weak_factory_for_io_.GetWeakPtr(),
7 -#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11)
8 +#elif defined(OS_LINUX) && defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11)
9 gfx::GLContextGLX* glx_context =
10 static_cast<gfx::GLContextGLX*>(stub_->decoder()->GetGLContext());
11 GLXContext glx_context_handle =