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 <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/android/context_utils.h" | 9 #include "base/android/context_utils.h" |
10 #include "base/android/jni_android.h" | 10 #include "base/android/jni_android.h" |
11 #include "base/android/jni_string.h" | 11 #include "base/android/jni_string.h" |
12 #include "base/logging.h" | 12 #include "base/logging.h" |
13 #include "base/metrics/histogram_macros.h" | 13 #include "base/metrics/histogram_macros.h" |
14 #include "base/strings/string_util.h" | 14 #include "base/strings/string_util.h" |
15 #include "jni/MediaPlayerBridge_jni.h" | 15 #include "jni/MediaPlayerBridge_jni.h" |
16 #include "media/base/android/media_common_android.h" | 16 #include "media/base/android/media_common_android.h" |
17 #include "media/base/android/media_player_manager.h" | 17 #include "media/base/android/media_player_manager.h" |
18 #include "media/base/android/media_resource_getter.h" | 18 #include "media/base/android/media_resource_getter.h" |
19 #include "media/base/android/media_url_interceptor.h" | 19 #include "media/base/android/media_url_interceptor.h" |
20 #include "media/base/timestamp_constants.h" | 20 #include "media/base/timestamp_constants.h" |
21 | 21 |
22 using base::android::ConvertUTF8ToJavaString; | 22 using base::android::ConvertUTF8ToJavaString; |
| 23 using base::android::JavaParamRef; |
23 using base::android::ScopedJavaLocalRef; | 24 using base::android::ScopedJavaLocalRef; |
24 | 25 |
25 namespace media { | 26 namespace media { |
26 | 27 |
27 namespace { | 28 namespace { |
28 | 29 |
29 enum UMAExitStatus { | 30 enum UMAExitStatus { |
30 UMA_EXIT_SUCCESS = 0, | 31 UMA_EXIT_SUCCESS = 0, |
31 UMA_EXIT_ERROR, | 32 UMA_EXIT_ERROR, |
32 UMA_EXIT_STATUS_MAX = UMA_EXIT_ERROR, | 33 UMA_EXIT_STATUS_MAX = UMA_EXIT_ERROR, |
(...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
598 | 599 |
599 GURL MediaPlayerBridge::GetUrl() { | 600 GURL MediaPlayerBridge::GetUrl() { |
600 return url_; | 601 return url_; |
601 } | 602 } |
602 | 603 |
603 GURL MediaPlayerBridge::GetFirstPartyForCookies() { | 604 GURL MediaPlayerBridge::GetFirstPartyForCookies() { |
604 return first_party_for_cookies_; | 605 return first_party_for_cookies_; |
605 } | 606 } |
606 | 607 |
607 } // namespace media | 608 } // namespace media |
OLD | NEW |