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

Side by Side Diff: media/base/android/media_source_player.h

Issue 18052007: Use a direct include of time headers in media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « media/base/android/media_resource_getter.h ('k') | media/base/audio_buffer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_ 5 #ifndef MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_
6 #define MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_ 6 #define MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/android/scoped_java_ref.h" 13 #include "base/android/scoped_java_ref.h"
14 #include "base/callback.h" 14 #include "base/callback.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
17 #include "base/threading/thread.h" 17 #include "base/threading/thread.h"
18 #include "base/time.h" 18 #include "base/time/time.h"
19 #include "media/base/android/demuxer_stream_player_params.h" 19 #include "media/base/android/demuxer_stream_player_params.h"
20 #include "media/base/android/media_codec_bridge.h" 20 #include "media/base/android/media_codec_bridge.h"
21 #include "media/base/android/media_player_android.h" 21 #include "media/base/android/media_player_android.h"
22 #include "media/base/media_export.h" 22 #include "media/base/media_export.h"
23 23
24 namespace base { 24 namespace base {
25 class MessageLoopProxy; 25 class MessageLoopProxy;
26 } 26 }
27 27
28 namespace media { 28 namespace media {
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 257
258 MediaDrmBridge* drm_bridge_; 258 MediaDrmBridge* drm_bridge_;
259 259
260 friend class MediaSourcePlayerTest; 260 friend class MediaSourcePlayerTest;
261 DISALLOW_COPY_AND_ASSIGN(MediaSourcePlayer); 261 DISALLOW_COPY_AND_ASSIGN(MediaSourcePlayer);
262 }; 262 };
263 263
264 } // namespace media 264 } // namespace media
265 265
266 #endif // MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_ 266 #endif // MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_
OLDNEW
« no previous file with comments | « media/base/android/media_resource_getter.h ('k') | media/base/audio_buffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698