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 "webkit/media/android/webmediaplayer_impl_android.h" | 5 #include "webkit/media/android/webmediaplayer_impl_android.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "media/base/android/media_player_bridge.h" | 9 #include "media/base/android/media_player_bridge.h" |
10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" | 10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
122 | 122 |
123 void WebMediaPlayerImplAndroid::OnMediaPlayerPause() { | 123 void WebMediaPlayerImplAndroid::OnMediaPlayerPause() { |
124 UpdatePlayingState(false); | 124 UpdatePlayingState(false); |
125 client()->playbackStateChanged(); | 125 client()->playbackStateChanged(); |
126 } | 126 } |
127 | 127 |
128 void WebMediaPlayerImplAndroid::Destroy() { | 128 void WebMediaPlayerImplAndroid::Destroy() { |
129 proxy_ = NULL; | 129 proxy_ = NULL; |
130 } | 130 } |
131 | 131 |
| 132 #if defined(GOOGLE_TV) |
132 void WebMediaPlayerImplAndroid::RequestExternalSurface() { | 133 void WebMediaPlayerImplAndroid::RequestExternalSurface() { |
133 if (proxy_) | 134 if (proxy_) |
134 proxy_->RequestExternalSurface(player_id()); | 135 proxy_->RequestExternalSurface(player_id()); |
135 } | 136 } |
| 137 #endif |
136 | 138 |
137 void WebMediaPlayerImplAndroid::SetVideoSurface(jobject j_surface) {} | 139 void WebMediaPlayerImplAndroid::SetVideoSurface(jobject j_surface) {} |
138 | 140 |
139 } // namespace webkit_media | 141 } // namespace webkit_media |
OLD | NEW |