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

Side by Side Diff: media/base/android/media_player_bridge.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_player_android.h ('k') | media/base/android/media_player_manager.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_BRIDGE_H_ 5 #ifndef MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_H_
6 #define MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_H_ 6 #define MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
11 11
12 #include "base/android/scoped_java_ref.h" 12 #include "base/android/scoped_java_ref.h"
13 #include "base/callback.h" 13 #include "base/callback.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
16 #include "base/time.h" 16 #include "base/time/time.h"
17 #include "base/timer.h" 17 #include "base/timer/timer.h"
18 #include "googleurl/src/gurl.h" 18 #include "googleurl/src/gurl.h"
19 #include "media/base/android/media_player_android.h" 19 #include "media/base/android/media_player_android.h"
20 #include "media/base/android/media_player_listener.h" 20 #include "media/base/android/media_player_listener.h"
21 21
22 namespace media { 22 namespace media {
23 23
24 class MediaPlayerManager; 24 class MediaPlayerManager;
25 25
26 // This class serves as a bridge for native code to call java functions inside 26 // This class serves as a bridge for native code to call java functions inside
27 // android mediaplayer class. For more information on android mediaplayer, check 27 // android mediaplayer class. For more information on android mediaplayer, check
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 // Listener object that listens to all the media player events. 153 // Listener object that listens to all the media player events.
154 MediaPlayerListener listener_; 154 MediaPlayerListener listener_;
155 155
156 friend class MediaPlayerListener; 156 friend class MediaPlayerListener;
157 DISALLOW_COPY_AND_ASSIGN(MediaPlayerBridge); 157 DISALLOW_COPY_AND_ASSIGN(MediaPlayerBridge);
158 }; 158 };
159 159
160 } // namespace media 160 } // namespace media
161 161
162 #endif // MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_H_ 162 #endif // MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_H_
OLDNEW
« no previous file with comments | « media/base/android/media_player_android.h ('k') | media/base/android/media_player_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698