| 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 #include "media/base/android/media_player_bridge.h" | 5 #include "media/base/android/media_player_bridge.h" |
| 6 | 6 |
| 7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 8 #include "base/android/jni_string.h" | 8 #include "base/android/jni_string.h" |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/message_loop_proxy.h" | 11 #include "base/message_loop/message_loop_proxy.h" |
| 12 #include "jni/MediaPlayerBridge_jni.h" | 12 #include "jni/MediaPlayerBridge_jni.h" |
| 13 #include "jni/MediaPlayer_jni.h" | 13 #include "jni/MediaPlayer_jni.h" |
| 14 #include "media/base/android/media_player_manager.h" | 14 #include "media/base/android/media_player_manager.h" |
| 15 #include "media/base/android/media_resource_getter.h" | 15 #include "media/base/android/media_resource_getter.h" |
| 16 #include "media/base/android/media_source_player.h" | 16 #include "media/base/android/media_source_player.h" |
| 17 | 17 |
| 18 using base::android::ConvertUTF8ToJavaString; | 18 using base::android::ConvertUTF8ToJavaString; |
| 19 using base::android::ScopedJavaLocalRef; | 19 using base::android::ScopedJavaLocalRef; |
| 20 | 20 |
| 21 // Time update happens every 250ms. | 21 // Time update happens every 250ms. |
| (...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 423 | 423 |
| 424 GURL MediaPlayerBridge::GetUrl() { | 424 GURL MediaPlayerBridge::GetUrl() { |
| 425 return url_; | 425 return url_; |
| 426 } | 426 } |
| 427 | 427 |
| 428 GURL MediaPlayerBridge::GetFirstPartyForCookies() { | 428 GURL MediaPlayerBridge::GetFirstPartyForCookies() { |
| 429 return first_party_for_cookies_; | 429 return first_party_for_cookies_; |
| 430 } | 430 } |
| 431 | 431 |
| 432 } // namespace media | 432 } // namespace media |
| OLD | NEW |