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 3705 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3716 Send(new FrameHostMsg_DidRunContentWithCertificateErrors( | 3716 Send(new FrameHostMsg_DidRunContentWithCertificateErrors( |
3717 routing_id_, GURL(main_resource_url).GetOrigin(), url, security_info)); | 3717 routing_id_, GURL(main_resource_url).GetOrigin(), url, security_info)); |
3718 } | 3718 } |
3719 | 3719 |
3720 void RenderFrameImpl::didChangePerformanceTiming() { | 3720 void RenderFrameImpl::didChangePerformanceTiming() { |
3721 FOR_EACH_OBSERVER(RenderFrameObserver, | 3721 FOR_EACH_OBSERVER(RenderFrameObserver, |
3722 observers_, | 3722 observers_, |
3723 DidChangePerformanceTiming()); | 3723 DidChangePerformanceTiming()); |
3724 } | 3724 } |
3725 | 3725 |
3726 void RenderFrameImpl::didAbortLoading(blink::WebLocalFrame* frame) { | |
3727 DCHECK(!frame_ || frame_ == frame); | |
3728 #if defined(ENABLE_PLUGINS) | |
3729 if (frame != render_view_->webview()->mainFrame()) | |
3730 return; | |
3731 PluginChannelHost::Broadcast( | |
3732 new PluginHostMsg_DidAbortLoading(render_view_->GetRoutingID())); | |
3733 #endif | |
3734 } | |
3735 | |
3736 void RenderFrameImpl::didCreateScriptContext(blink::WebLocalFrame* frame, | 3726 void RenderFrameImpl::didCreateScriptContext(blink::WebLocalFrame* frame, |
3737 v8::Local<v8::Context> context, | 3727 v8::Local<v8::Context> context, |
3738 int extension_group, | 3728 int extension_group, |
3739 int world_id) { | 3729 int world_id) { |
3740 DCHECK(!frame_ || frame_ == frame); | 3730 DCHECK(!frame_ || frame_ == frame); |
3741 | 3731 |
3742 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, | 3732 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, |
3743 DidCreateScriptContext(context, extension_group, world_id)); | 3733 DidCreateScriptContext(context, extension_group, world_id)); |
3744 } | 3734 } |
3745 | 3735 |
(...skipping 1746 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5492 media::ConvertToSwitchOutputDeviceCB(web_callbacks); | 5482 media::ConvertToSwitchOutputDeviceCB(web_callbacks); |
5493 scoped_refptr<media::AudioOutputDevice> device = | 5483 scoped_refptr<media::AudioOutputDevice> device = |
5494 AudioDeviceFactory::NewOutputDevice(routing_id_, 0, sink_id.utf8(), | 5484 AudioDeviceFactory::NewOutputDevice(routing_id_, 0, sink_id.utf8(), |
5495 security_origin); | 5485 security_origin); |
5496 media::OutputDeviceStatus status = device->GetDeviceStatus(); | 5486 media::OutputDeviceStatus status = device->GetDeviceStatus(); |
5497 device->Stop(); | 5487 device->Stop(); |
5498 callback.Run(status); | 5488 callback.Run(status); |
5499 } | 5489 } |
5500 | 5490 |
5501 } // namespace content | 5491 } // namespace content |
OLD | NEW |