content/common/gpu/media/gles2_texture_to_egl_image_translator.cc - Issue 10441028: aura/cros: Rename MessagePump{X => AuraX11} and move the atom cache into it.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/common/gpu/media/gles2_texture_to_egl_image_translator.cc

Issue 10441028: aura/cros: Rename MessagePump{X => AuraX11} and move the atom cache into it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix compile error in file added in the interim Created 8 years, 7 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/common/gpu/media/gles2_texture_to_egl_image_translator.cc

diff --git a/content/common/gpu/media/gles2_texture_to_egl_image_translator.cc b/content/common/gpu/media/gles2_texture_to_egl_image_translator.cc

index 18701e8bbb9e3cc63fed2f6dfa0907fad6f17642..e1ac5172363c852a817b64968bb118de8dea312b 100644

--- a/content/common/gpu/media/gles2_texture_to_egl_image_translator.cc

+++ b/content/common/gpu/media/gles2_texture_to_egl_image_translator.cc

@@ -5,8 +5,11 @@

#include "content/common/gpu/media/gles2_texture_to_egl_image_translator.h"

#include "base/logging.h"

-#include "base/message_pump_x.h"

+#if defined(TOOLKIT_USES_GTK)

+#include "base/message_pump_gtk.h"

+#elif defined(USE_AURA)

+#include "base/message_pump_aurax11.h"

+#endif

// Get EGL extension functions.

static PFNEGLCREATEIMAGEKHRPROC egl_create_image_khr =

« no previous file with comments | « content/browser/power_save_blocker_linux.cc ('k') | ui/aura/bench/bench_main.cc » ('j') | no next file with comments »