diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-10 11:40:50 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-10 11:40:50 +0100 |
| commit | eb525c5499e34cc9c4b825d6d9e75bb07cc06ace (patch) | |
| tree | d908ce4bfe1717d2cd53f41327d8b9ba8304355f /media/filters/skcanvas_video_renderer.h | |
| parent | 3c54152607de4272b3da0c146b71dcba8a0e5610 (diff) | |
| download | chromium_org-eb525c5499e34cc9c4b825d6d9e75bb07cc06ace.tar.gz | |
Merge from Chromium at DEPS revision r210036
This commit was generated by merge_to_master.py.
Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
Diffstat (limited to 'media/filters/skcanvas_video_renderer.h')
| -rw-r--r-- | media/filters/skcanvas_video_renderer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/filters/skcanvas_video_renderer.h b/media/filters/skcanvas_video_renderer.h index cf960a4af5..9e3622d79c 100644 --- a/media/filters/skcanvas_video_renderer.h +++ b/media/filters/skcanvas_video_renderer.h @@ -5,10 +5,10 @@ #ifndef MEDIA_FILTERS_SKCANVAS_VIDEO_RENDERER_H_ #define MEDIA_FILTERS_SKCANVAS_VIDEO_RENDERER_H_ -#include "base/time.h" +#include "base/time/time.h" #include "media/base/media_export.h" -#include "ui/gfx/rect.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/gfx/rect.h" class SkCanvas; |