OLD | NEW |
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/macros.h" | 12 #include "base/macros.h" |
| 13 #include "base/memory/scoped_ptr.h" |
13 #include "base/memory/weak_ptr.h" | 14 #include "base/memory/weak_ptr.h" |
14 #include "base/time/time.h" | 15 #include "base/time/time.h" |
15 #include "media/base/android/media_player_listener.h" | 16 #include "media/base/android/media_player_listener.h" |
16 #include "media/base/media_export.h" | 17 #include "media/base/media_export.h" |
17 #include "ui/gfx/geometry/size.h" | 18 #include "ui/gfx/geometry/size.h" |
18 #include "ui/gl/android/scoped_java_surface.h" | 19 #include "ui/gl/android/scoped_java_surface.h" |
19 #include "url/gurl.h" | 20 #include "url/gurl.h" |
20 | 21 |
21 namespace media { | 22 namespace media { |
22 | 23 |
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
195 // Weak pointer passed to |listener_| for callbacks. | 196 // Weak pointer passed to |listener_| for callbacks. |
196 // NOTE: Weak pointers must be invalidated before all other member variables. | 197 // NOTE: Weak pointers must be invalidated before all other member variables. |
197 base::WeakPtrFactory<MediaPlayerAndroid> weak_factory_; | 198 base::WeakPtrFactory<MediaPlayerAndroid> weak_factory_; |
198 | 199 |
199 DISALLOW_COPY_AND_ASSIGN(MediaPlayerAndroid); | 200 DISALLOW_COPY_AND_ASSIGN(MediaPlayerAndroid); |
200 }; | 201 }; |
201 | 202 |
202 } // namespace media | 203 } // namespace media |
203 | 204 |
204 #endif // MEDIA_BASE_ANDROID_MEDIA_PLAYER_ANDROID_H_ | 205 #endif // MEDIA_BASE_ANDROID_MEDIA_PLAYER_ANDROID_H_ |
OLD | NEW |