Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1182)

Unified Diff: content/common/gpu/media/android_video_encode_accelerator.h

Issue 1159553007: Move Tuple to base namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « content/common/gpu/gpu_channel.cc ('k') | content/common/gpu/media/android_video_encode_accelerator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/media/android_video_encode_accelerator.h
diff --git a/content/common/gpu/media/android_video_encode_accelerator.h b/content/common/gpu/media/android_video_encode_accelerator.h
index c828de8493f8b40dfaa2d51a07ad019b4d127bd9..e0ae0eb1b04461c2cd3963dbaf781c2c4151720a 100644
--- a/content/common/gpu/media/android_video_encode_accelerator.h
+++ b/content/common/gpu/media/android_video_encode_accelerator.h
@@ -85,7 +85,7 @@ class CONTENT_EXPORT AndroidVideoEncodeAccelerator
// Frames waiting to be passed to the codec, queued until an input buffer is
// available. Each element is a tuple of <Frame, key_frame, enqueue_time>.
typedef std::queue<
- Tuple<scoped_refptr<media::VideoFrame>, bool, base::Time>>
+ base::Tuple<scoped_refptr<media::VideoFrame>, bool, base::Time>>
PendingFrames;
PendingFrames pending_frames_;
« no previous file with comments | « content/common/gpu/gpu_channel.cc ('k') | content/common/gpu/media/android_video_encode_accelerator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698