| 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 3620 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3631 "ContentSettings.MixedScript.RanMixedScript", | 3631 "ContentSettings.MixedScript.RanMixedScript", |
| 3632 GURL(origin.toString().utf8())); | 3632 GURL(origin.toString().utf8())); |
| 3633 } | 3633 } |
| 3634 | 3634 |
| 3635 void RenderFrameImpl::didChangePerformanceTiming() { | 3635 void RenderFrameImpl::didChangePerformanceTiming() { |
| 3636 FOR_EACH_OBSERVER(RenderFrameObserver, | 3636 FOR_EACH_OBSERVER(RenderFrameObserver, |
| 3637 observers_, | 3637 observers_, |
| 3638 DidChangePerformanceTiming()); | 3638 DidChangePerformanceTiming()); |
| 3639 } | 3639 } |
| 3640 | 3640 |
| 3641 void RenderFrameImpl::didAbortLoading(blink::WebLocalFrame* frame) { | |
| 3642 DCHECK(!frame_ || frame_ == frame); | |
| 3643 #if defined(ENABLE_PLUGINS) | |
| 3644 if (frame != render_view_->webview()->mainFrame()) | |
| 3645 return; | |
| 3646 PluginChannelHost::Broadcast( | |
| 3647 new PluginHostMsg_DidAbortLoading(render_view_->GetRoutingID())); | |
| 3648 #endif | |
| 3649 } | |
| 3650 | |
| 3651 void RenderFrameImpl::didCreateScriptContext(blink::WebLocalFrame* frame, | 3641 void RenderFrameImpl::didCreateScriptContext(blink::WebLocalFrame* frame, |
| 3652 v8::Local<v8::Context> context, | 3642 v8::Local<v8::Context> context, |
| 3653 int extension_group, | 3643 int extension_group, |
| 3654 int world_id) { | 3644 int world_id) { |
| 3655 DCHECK(!frame_ || frame_ == frame); | 3645 DCHECK(!frame_ || frame_ == frame); |
| 3656 | 3646 |
| 3657 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, | 3647 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, |
| 3658 DidCreateScriptContext(context, extension_group, world_id)); | 3648 DidCreateScriptContext(context, extension_group, world_id)); |
| 3659 } | 3649 } |
| 3660 | 3650 |
| (...skipping 1700 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5361 media::ConvertToSwitchOutputDeviceCB(web_callbacks); | 5351 media::ConvertToSwitchOutputDeviceCB(web_callbacks); |
| 5362 scoped_refptr<media::AudioOutputDevice> device = | 5352 scoped_refptr<media::AudioOutputDevice> device = |
| 5363 AudioDeviceFactory::NewOutputDevice(routing_id_, 0, sink_id.utf8(), | 5353 AudioDeviceFactory::NewOutputDevice(routing_id_, 0, sink_id.utf8(), |
| 5364 security_origin); | 5354 security_origin); |
| 5365 media::OutputDeviceStatus status = device->GetDeviceStatus(); | 5355 media::OutputDeviceStatus status = device->GetDeviceStatus(); |
| 5366 device->Stop(); | 5356 device->Stop(); |
| 5367 callback.Run(status); | 5357 callback.Run(status); |
| 5368 } | 5358 } |
| 5369 | 5359 |
| 5370 } // namespace content | 5360 } // namespace content |
| OLD | NEW |