| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "content/renderer/media/android/renderer_media_player_manager.h" | 5 #include "content/renderer/media/android/renderer_media_player_manager.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "content/common/media/media_player_messages_android.h" | 9 #include "content/common/media/media_player_messages_android.h" |
| 10 #include "content/renderer/media/android/proxy_media_keys.h" | 10 #include "content/renderer/media/android/proxy_media_keys.h" |
| (...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 317 return iter->second; | 317 return iter->second; |
| 318 return NULL; | 318 return NULL; |
| 319 } | 319 } |
| 320 | 320 |
| 321 ProxyMediaKeys* RendererMediaPlayerManager::GetMediaKeys(int media_keys_id) { | 321 ProxyMediaKeys* RendererMediaPlayerManager::GetMediaKeys(int media_keys_id) { |
| 322 std::map<int, ProxyMediaKeys*>::iterator iter = | 322 std::map<int, ProxyMediaKeys*>::iterator iter = |
| 323 media_keys_.find(media_keys_id); | 323 media_keys_.find(media_keys_id); |
| 324 return (iter != media_keys_.end()) ? iter->second : NULL; | 324 return (iter != media_keys_.end()) ? iter->second : NULL; |
| 325 } | 325 } |
| 326 | 326 |
| 327 bool RendererMediaPlayerManager::CanEnterFullscreen(WebKit::WebFrame* frame) { | 327 bool RendererMediaPlayerManager::CanEnterFullscreen(blink::WebFrame* frame) { |
| 328 return !fullscreen_frame_ || IsInFullscreen(frame); | 328 return !fullscreen_frame_ || IsInFullscreen(frame); |
| 329 } | 329 } |
| 330 | 330 |
| 331 void RendererMediaPlayerManager::DidEnterFullscreen(WebKit::WebFrame* frame) { | 331 void RendererMediaPlayerManager::DidEnterFullscreen(blink::WebFrame* frame) { |
| 332 fullscreen_frame_ = frame; | 332 fullscreen_frame_ = frame; |
| 333 } | 333 } |
| 334 | 334 |
| 335 void RendererMediaPlayerManager::DidExitFullscreen() { | 335 void RendererMediaPlayerManager::DidExitFullscreen() { |
| 336 fullscreen_frame_ = NULL; | 336 fullscreen_frame_ = NULL; |
| 337 } | 337 } |
| 338 | 338 |
| 339 bool RendererMediaPlayerManager::IsInFullscreen(WebKit::WebFrame* frame) { | 339 bool RendererMediaPlayerManager::IsInFullscreen(blink::WebFrame* frame) { |
| 340 return fullscreen_frame_ == frame; | 340 return fullscreen_frame_ == frame; |
| 341 } | 341 } |
| 342 | 342 |
| 343 #if defined(GOOGLE_TV) | 343 #if defined(GOOGLE_TV) |
| 344 void RendererMediaPlayerManager::RequestExternalSurface( | 344 void RendererMediaPlayerManager::RequestExternalSurface( |
| 345 int player_id, | 345 int player_id, |
| 346 const gfx::RectF& geometry) { | 346 const gfx::RectF& geometry) { |
| 347 Send(new MediaPlayerHostMsg_NotifyExternalSurface( | 347 Send(new MediaPlayerHostMsg_NotifyExternalSurface( |
| 348 routing_id(), player_id, true, geometry)); | 348 routing_id(), player_id, true, geometry)); |
| 349 } | 349 } |
| (...skipping 22 matching lines...) Expand all Loading... |
| 372 gfx::RectF rect; | 372 gfx::RectF rect; |
| 373 if (player->RetrieveGeometryChange(&rect)) { | 373 if (player->RetrieveGeometryChange(&rect)) { |
| 374 (*changes)[player_it->first] = rect; | 374 (*changes)[player_it->first] = rect; |
| 375 } | 375 } |
| 376 } | 376 } |
| 377 } | 377 } |
| 378 } | 378 } |
| 379 #endif | 379 #endif |
| 380 | 380 |
| 381 } // namespace content | 381 } // namespace content |
| OLD | NEW |