| Index: content/renderer/media/android/renderer_media_player_manager.cc
|
| diff --git a/content/renderer/media/android/renderer_media_player_manager.cc b/content/renderer/media/android/renderer_media_player_manager.cc
|
| index d465a257e7d6319785cd101f345ced25b3eabb01..4750549f387b5b23faa057eebd00d993a9b2eb0c 100644
|
| --- a/content/renderer/media/android/renderer_media_player_manager.cc
|
| +++ b/content/renderer/media/android/renderer_media_player_manager.cc
|
| @@ -324,11 +324,11 @@ ProxyMediaKeys* RendererMediaPlayerManager::GetMediaKeys(int media_keys_id) {
|
| return (iter != media_keys_.end()) ? iter->second : NULL;
|
| }
|
|
|
| -bool RendererMediaPlayerManager::CanEnterFullscreen(WebKit::WebFrame* frame) {
|
| +bool RendererMediaPlayerManager::CanEnterFullscreen(blink::WebFrame* frame) {
|
| return !fullscreen_frame_ || IsInFullscreen(frame);
|
| }
|
|
|
| -void RendererMediaPlayerManager::DidEnterFullscreen(WebKit::WebFrame* frame) {
|
| +void RendererMediaPlayerManager::DidEnterFullscreen(blink::WebFrame* frame) {
|
| fullscreen_frame_ = frame;
|
| }
|
|
|
| @@ -336,7 +336,7 @@ void RendererMediaPlayerManager::DidExitFullscreen() {
|
| fullscreen_frame_ = NULL;
|
| }
|
|
|
| -bool RendererMediaPlayerManager::IsInFullscreen(WebKit::WebFrame* frame) {
|
| +bool RendererMediaPlayerManager::IsInFullscreen(blink::WebFrame* frame) {
|
| return fullscreen_frame_ == frame;
|
| }
|
|
|
|
|