Chromium Code Reviews| 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/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 3396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3407 } | 3407 } |
| 3408 } | 3408 } |
| 3409 | 3409 |
| 3410 void RenderFrameImpl::didChangeManifest(blink::WebLocalFrame* frame) | 3410 void RenderFrameImpl::didChangeManifest(blink::WebLocalFrame* frame) |
| 3411 { | 3411 { |
| 3412 DCHECK(!frame_ || frame_ == frame); | 3412 DCHECK(!frame_ || frame_ == frame); |
| 3413 | 3413 |
| 3414 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, DidChangeManifest()); | 3414 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, DidChangeManifest()); |
| 3415 } | 3415 } |
| 3416 | 3416 |
| 3417 bool RenderFrameImpl::enterFullscreen() | |
|
dcheng
2014/12/10 06:58:00
What's the point of having a bool return value if
mlamouri (slow - plz ping)
2014/12/10 15:47:02
It's only in order to do the transition in Blink.
dcheng
2014/12/10 20:45:01
Let's make sure to clean this up afterwards.
| |
| 3418 { | |
| 3419 Send(new FrameHostMsg_ToggleFullscreen(routing_id_, true)); | |
| 3420 return true; | |
| 3421 } | |
| 3422 | |
| 3423 bool RenderFrameImpl::exitFullscreen() | |
| 3424 { | |
| 3425 Send(new FrameHostMsg_ToggleFullscreen(routing_id_, false)); | |
| 3426 return true; | |
| 3427 } | |
| 3428 | |
| 3417 void RenderFrameImpl::DidPlay(blink::WebMediaPlayer* player) { | 3429 void RenderFrameImpl::DidPlay(blink::WebMediaPlayer* player) { |
| 3418 Send(new FrameHostMsg_MediaPlayingNotification( | 3430 Send(new FrameHostMsg_MediaPlayingNotification( |
| 3419 routing_id_, reinterpret_cast<int64>(player), player->hasVideo(), | 3431 routing_id_, reinterpret_cast<int64>(player), player->hasVideo(), |
| 3420 player->hasAudio(), player->isRemote())); | 3432 player->hasAudio(), player->isRemote())); |
| 3421 } | 3433 } |
| 3422 | 3434 |
| 3423 void RenderFrameImpl::DidPause(blink::WebMediaPlayer* player) { | 3435 void RenderFrameImpl::DidPause(blink::WebMediaPlayer* player) { |
| 3424 Send(new FrameHostMsg_MediaPausedNotification( | 3436 Send(new FrameHostMsg_MediaPausedNotification( |
| 3425 routing_id_, reinterpret_cast<int64>(player))); | 3437 routing_id_, reinterpret_cast<int64>(player))); |
| 3426 } | 3438 } |
| (...skipping 839 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4266 | 4278 |
| 4267 #if defined(ENABLE_BROWSER_CDMS) | 4279 #if defined(ENABLE_BROWSER_CDMS) |
| 4268 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 4280 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
| 4269 if (!cdm_manager_) | 4281 if (!cdm_manager_) |
| 4270 cdm_manager_ = new RendererCdmManager(this); | 4282 cdm_manager_ = new RendererCdmManager(this); |
| 4271 return cdm_manager_; | 4283 return cdm_manager_; |
| 4272 } | 4284 } |
| 4273 #endif // defined(ENABLE_BROWSER_CDMS) | 4285 #endif // defined(ENABLE_BROWSER_CDMS) |
| 4274 | 4286 |
| 4275 } // namespace content | 4287 } // namespace content |
| OLD | NEW |