| 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 "content/common/media/media_player_messages_android.h" | 7 #include "content/common/media/media_player_messages_android.h" |
| 8 #include "content/public/common/renderer_preferences.h" | 8 #include "content/public/common/renderer_preferences.h" |
| 9 #include "content/renderer/media/android/renderer_media_player_manager.h" | 9 #include "content/renderer/media/android/renderer_media_player_manager.h" |
| 10 #include "content/renderer/media/android/webmediaplayer_android.h" | 10 #include "content/renderer/media/android/webmediaplayer_android.h" |
| (...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 327 if (player->UpdateBoundaryRectangle()) | 327 if (player->UpdateBoundaryRectangle()) |
| 328 (*changes)[player_it->first] = player->GetBoundaryRectangle(); | 328 (*changes)[player_it->first] = player->GetBoundaryRectangle(); |
| 329 } | 329 } |
| 330 } | 330 } |
| 331 } | 331 } |
| 332 | 332 |
| 333 bool | 333 bool |
| 334 RendererMediaPlayerManager::ShouldUseVideoOverlayForEmbeddedEncryptedVideo() { | 334 RendererMediaPlayerManager::ShouldUseVideoOverlayForEmbeddedEncryptedVideo() { |
| 335 const RendererPreferences& prefs = static_cast<RenderFrameImpl*>( | 335 const RendererPreferences& prefs = static_cast<RenderFrameImpl*>( |
| 336 render_frame())->render_view()->renderer_preferences(); | 336 render_frame())->render_view()->renderer_preferences(); |
| 337 return prefs.use_video_overlay_for_embedded_encrypted_video; | 337 return prefs.allow_video_overlay_for_embedded_encrypted_video; |
| 338 } | 338 } |
| 339 #endif // defined(VIDEO_HOLE) | 339 #endif // defined(VIDEO_HOLE) |
| 340 | 340 |
| 341 } // namespace content | 341 } // namespace content |
| OLD | NEW |