| 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/message_loop_proxy.h" | |
| 12 #include "base/strings/string_util.h" | 11 #include "base/strings/string_util.h" |
| 13 #include "jni/MediaPlayerBridge_jni.h" | 12 #include "jni/MediaPlayerBridge_jni.h" |
| 14 #include "media/base/android/media_common_android.h" | 13 #include "media/base/android/media_common_android.h" |
| 15 #include "media/base/android/media_player_manager.h" | 14 #include "media/base/android/media_player_manager.h" |
| 16 #include "media/base/android/media_resource_getter.h" | 15 #include "media/base/android/media_resource_getter.h" |
| 17 #include "media/base/android/media_url_interceptor.h" | 16 #include "media/base/android/media_url_interceptor.h" |
| 18 #include "media/base/buffers.h" | 17 #include "media/base/buffers.h" |
| 19 | 18 |
| 20 using base::android::ConvertUTF8ToJavaString; | 19 using base::android::ConvertUTF8ToJavaString; |
| 21 using base::android::ScopedJavaLocalRef; | 20 using base::android::ScopedJavaLocalRef; |
| (...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 530 | 529 |
| 531 GURL MediaPlayerBridge::GetUrl() { | 530 GURL MediaPlayerBridge::GetUrl() { |
| 532 return url_; | 531 return url_; |
| 533 } | 532 } |
| 534 | 533 |
| 535 GURL MediaPlayerBridge::GetFirstPartyForCookies() { | 534 GURL MediaPlayerBridge::GetFirstPartyForCookies() { |
| 536 return first_party_for_cookies_; | 535 return first_party_for_cookies_; |
| 537 } | 536 } |
| 538 | 537 |
| 539 } // namespace media | 538 } // namespace media |
| OLD | NEW |