| OLD | NEW | 
|---|
| 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 <stdint.h> | 9 #include <stdint.h> | 
|  | 10 | 
| 10 #include <map> | 11 #include <map> | 
| 11 #include <string> | 12 #include <string> | 
| 12 | 13 | 
| 13 #include "base/android/scoped_java_ref.h" | 14 #include "base/android/scoped_java_ref.h" | 
| 14 #include "base/callback.h" | 15 #include "base/callback.h" | 
| 15 #include "base/macros.h" | 16 #include "base/macros.h" | 
| 16 #include "base/memory/scoped_ptr.h" |  | 
| 17 #include "base/memory/weak_ptr.h" | 17 #include "base/memory/weak_ptr.h" | 
| 18 #include "base/strings/string16.h" | 18 #include "base/strings/string16.h" | 
| 19 #include "base/time/time.h" | 19 #include "base/time/time.h" | 
| 20 #include "base/timer/timer.h" | 20 #include "base/timer/timer.h" | 
| 21 #include "media/base/android/media_player_android.h" | 21 #include "media/base/android/media_player_android.h" | 
| 22 #include "url/gurl.h" | 22 #include "url/gurl.h" | 
| 23 | 23 | 
| 24 namespace media { | 24 namespace media { | 
| 25 | 25 | 
| 26 class MediaPlayerManager; | 26 class MediaPlayerManager; | 
| (...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 216 | 216 | 
| 217   // NOTE: Weak pointers must be invalidated before all other member variables. | 217   // NOTE: Weak pointers must be invalidated before all other member variables. | 
| 218   base::WeakPtrFactory<MediaPlayerBridge> weak_factory_; | 218   base::WeakPtrFactory<MediaPlayerBridge> weak_factory_; | 
| 219 | 219 | 
| 220   DISALLOW_COPY_AND_ASSIGN(MediaPlayerBridge); | 220   DISALLOW_COPY_AND_ASSIGN(MediaPlayerBridge); | 
| 221 }; | 221 }; | 
| 222 | 222 | 
| 223 }  // namespace media | 223 }  // namespace media | 
| 224 | 224 | 
| 225 #endif  // MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_H_ | 225 #endif  // MEDIA_BASE_ANDROID_MEDIA_PLAYER_BRIDGE_H_ | 
| OLD | NEW | 
|---|