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

Side by Side Diff: media/base/android/media_player_android.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_codec_bridge.h ('k') | media/base/android/media_player_bridge.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_PLAYER_ANDROID_H_ 5 #ifndef MEDIA_BASE_ANDROID_MEDIA_PLAYER_ANDROID_H_
6 #define MEDIA_BASE_ANDROID_MEDIA_PLAYER_ANDROID_H_ 6 #define MEDIA_BASE_ANDROID_MEDIA_PLAYER_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <string> 9 #include <string>
10 10
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/time.h" 12 #include "base/time/time.h"
13 #include "googleurl/src/gurl.h" 13 #include "googleurl/src/gurl.h"
14 #include "media/base/android/demuxer_stream_player_params.h" 14 #include "media/base/android/demuxer_stream_player_params.h"
15 #include "media/base/media_export.h" 15 #include "media/base/media_export.h"
16 #include "ui/gl/android/scoped_java_surface.h" 16 #include "ui/gl/android/scoped_java_surface.h"
17 17
18 namespace media { 18 namespace media {
19 19
20 class MediaDrmBridge; 20 class MediaDrmBridge;
21 class MediaPlayerManager; 21 class MediaPlayerManager;
22 22
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 132
133 // Resource manager for all the media players. 133 // Resource manager for all the media players.
134 MediaPlayerManager* manager_; 134 MediaPlayerManager* manager_;
135 135
136 DISALLOW_COPY_AND_ASSIGN(MediaPlayerAndroid); 136 DISALLOW_COPY_AND_ASSIGN(MediaPlayerAndroid);
137 }; 137 };
138 138
139 } // namespace media 139 } // namespace media
140 140
141 #endif // MEDIA_BASE_ANDROID_MEDIA_PLAYER_ANDROID_H_ 141 #endif // MEDIA_BASE_ANDROID_MEDIA_PLAYER_ANDROID_H_
OLDNEW
« no previous file with comments | « media/base/android/media_codec_bridge.h ('k') | media/base/android/media_player_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698