diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-20 03:38:15 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-20 03:38:15 +0000 |
| commit | 33e585a3ede97b536b5bcbbfbfedb732f364eecc (patch) | |
| tree | 306014c5dd1f203d9f75e9f48933a3b74a728180 /media/tools | |
| parent | c7f46d3c7b019d97402b10d3a25bf1021db17cf7 (diff) | |
| download | chromium_src-33e585a3ede97b536b5bcbbfbfedb732f364eecc.zip chromium_src-33e585a3ede97b536b5bcbbfbfedb732f364eecc.tar.gz chromium_src-33e585a3ede97b536b5bcbbfbfedb732f364eecc.tar.bz2 | |
FBTF: Remove unneeded headers from base/ (part 9)
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/5091005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66873 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools')
| -rw-r--r-- | media/tools/player_x11/gl_video_renderer.h | 1 | ||||
| -rw-r--r-- | media/tools/player_x11/gles_video_renderer.h | 8 | ||||
| -rw-r--r-- | media/tools/player_x11/x11_video_renderer.h | 1 |
3 files changed, 5 insertions, 5 deletions
diff --git a/media/tools/player_x11/gl_video_renderer.h b/media/tools/player_x11/gl_video_renderer.h index c6ce45e..90e5217 100644 --- a/media/tools/player_x11/gl_video_renderer.h +++ b/media/tools/player_x11/gl_video_renderer.h @@ -6,7 +6,6 @@ #define MEDIA_TOOLS_PLAYER_X11_GL_VIDEO_RENDERER_H_ #include "app/gfx/gl/gl_bindings.h" -#include "base/lock.h" #include "base/scoped_ptr.h" #include "media/base/filters.h" #include "media/filters/video_renderer_base.h" diff --git a/media/tools/player_x11/gles_video_renderer.h b/media/tools/player_x11/gles_video_renderer.h index ead864f..3fcb89a 100644 --- a/media/tools/player_x11/gles_video_renderer.h +++ b/media/tools/player_x11/gles_video_renderer.h @@ -2,15 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MEDIA_TOOLS_PLAYER_X11_GL_VIDEO_RENDERER_H_ -#define MEDIA_TOOLS_PLAYER_X11_GL_VIDEO_RENDERER_H_ +#ifndef MEDIA_TOOLS_PLAYER_X11_GLES_VIDEO_RENDERER_H_ +#define MEDIA_TOOLS_PLAYER_X11_GLES_VIDEO_RENDERER_H_ #include <EGL/egl.h> #include <EGL/eglext.h> #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> -#include "base/lock.h" +#include <utility> +#include <vector> + #include "base/scoped_ptr.h" #include "media/base/filters.h" #include "media/base/video_frame.h" diff --git a/media/tools/player_x11/x11_video_renderer.h b/media/tools/player_x11/x11_video_renderer.h index 5076ef8..0129b60 100644 --- a/media/tools/player_x11/x11_video_renderer.h +++ b/media/tools/player_x11/x11_video_renderer.h @@ -7,7 +7,6 @@ #include <X11/Xlib.h> -#include "base/lock.h" #include "base/scoped_ptr.h" #include "media/base/filters.h" #include "media/filters/video_renderer_base.h" |