| 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 #include "media/base/android/media_player_android.h" | 5 #include "media/base/android/media_player_android.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "media/base/android/media_drm_bridge.h" |
| 8 #include "media/base/android/media_player_manager.h" | 9 #include "media/base/android/media_player_manager.h" |
| 9 | 10 |
| 10 namespace media { | 11 namespace media { |
| 11 | 12 |
| 12 MediaPlayerAndroid::MediaPlayerAndroid( | 13 MediaPlayerAndroid::MediaPlayerAndroid( |
| 13 int player_id, | 14 int player_id, |
| 14 MediaPlayerManager* manager) | 15 MediaPlayerManager* manager) |
| 15 : player_id_(player_id), | 16 : player_id_(player_id), |
| 16 manager_(manager) { | 17 manager_(manager) { |
| 17 } | 18 } |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 } | 82 } |
| 82 | 83 |
| 83 GURL MediaPlayerAndroid::GetUrl() { | 84 GURL MediaPlayerAndroid::GetUrl() { |
| 84 return GURL(); | 85 return GURL(); |
| 85 } | 86 } |
| 86 | 87 |
| 87 GURL MediaPlayerAndroid::GetFirstPartyForCookies() { | 88 GURL MediaPlayerAndroid::GetFirstPartyForCookies() { |
| 88 return GURL(); | 89 return GURL(); |
| 89 } | 90 } |
| 90 | 91 |
| 92 void MediaPlayerAndroid::SetDrmBridge(MediaDrmBridge* drm_bridge) { |
| 93 NOTREACHED() << "Unexpected SetDrmBridge() call"; |
| 94 } |
| 95 |
| 91 } // namespace media | 96 } // namespace media |
| OLD | NEW |