Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 1014623002: Revert "Refactor sudden termination" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase + fixed compilation error Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/test/test_render_frame_host.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 3602 matching lines...) Expand 10 before | Expand all | Expand 10 after
3613 bool RenderFrameImpl::enterFullscreen() { 3613 bool RenderFrameImpl::enterFullscreen() {
3614 Send(new FrameHostMsg_ToggleFullscreen(routing_id_, true)); 3614 Send(new FrameHostMsg_ToggleFullscreen(routing_id_, true));
3615 return true; 3615 return true;
3616 } 3616 }
3617 3617
3618 bool RenderFrameImpl::exitFullscreen() { 3618 bool RenderFrameImpl::exitFullscreen() {
3619 Send(new FrameHostMsg_ToggleFullscreen(routing_id_, false)); 3619 Send(new FrameHostMsg_ToggleFullscreen(routing_id_, false));
3620 return true; 3620 return true;
3621 } 3621 }
3622 3622
3623 void RenderFrameImpl::suddenTerminationDisablerChanged(
3624 bool present,
3625 blink::WebFrameClient::SuddenTerminationDisablerType type) {
3626 switch (type) {
3627 case blink::WebFrameClient::BeforeUnloadHandler:
3628 Send(new FrameHostMsg_BeforeUnloadHandlersPresent(
3629 routing_id_, present));
3630 break;
3631 case blink::WebFrameClient::UnloadHandler:
3632 Send(new FrameHostMsg_UnloadHandlersPresent(
3633 routing_id_, present));
3634 break;
3635 default:
3636 NOTREACHED();
3637 }
3638 }
3639
3640 blink::WebPermissionClient* RenderFrameImpl::permissionClient() { 3623 blink::WebPermissionClient* RenderFrameImpl::permissionClient() {
3641 if (!permission_client_) 3624 if (!permission_client_)
3642 permission_client_.reset(new PermissionManager(GetServiceRegistry())); 3625 permission_client_.reset(new PermissionManager(GetServiceRegistry()));
3643 3626
3644 return permission_client_.get(); 3627 return permission_client_.get();
3645 } 3628 }
3646 3629
3647 void RenderFrameImpl::DidPlay(blink::WebMediaPlayer* player) { 3630 void RenderFrameImpl::DidPlay(blink::WebMediaPlayer* player) {
3648 Send(new FrameHostMsg_MediaPlayingNotification( 3631 Send(new FrameHostMsg_MediaPlayingNotification(
3649 routing_id_, reinterpret_cast<int64>(player), player->hasVideo(), 3632 routing_id_, reinterpret_cast<int64>(player), player->hasVideo(),
(...skipping 887 matching lines...) Expand 10 before | Expand all | Expand 10 after
4537 4520
4538 #if defined(ENABLE_BROWSER_CDMS) 4521 #if defined(ENABLE_BROWSER_CDMS)
4539 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 4522 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
4540 if (!cdm_manager_) 4523 if (!cdm_manager_)
4541 cdm_manager_ = new RendererCdmManager(this); 4524 cdm_manager_ = new RendererCdmManager(this);
4542 return cdm_manager_; 4525 return cdm_manager_;
4543 } 4526 }
4544 #endif // defined(ENABLE_BROWSER_CDMS) 4527 #endif // defined(ENABLE_BROWSER_CDMS)
4545 4528
4546 } // namespace content 4529 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/test/test_render_frame_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698