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 2465 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2476 // can be optimized further by only sending the update if there are any | 2476 // can be optimized further by only sending the update if there are any |
2477 // remote frames in the frame tree, or delaying and batching up IPCs if | 2477 // remote frames in the frame tree, or delaying and batching up IPCs if |
2478 // updates are happening too frequently. | 2478 // updates are happening too frequently. |
2479 if (SiteIsolationPolicy::AreCrossProcessFramesPossible() || | 2479 if (SiteIsolationPolicy::AreCrossProcessFramesPossible() || |
2480 render_view_->renderer_preferences_.report_frame_name_changes) { | 2480 render_view_->renderer_preferences_.report_frame_name_changes) { |
2481 Send(new FrameHostMsg_DidChangeName( | 2481 Send(new FrameHostMsg_DidChangeName( |
2482 routing_id_, base::UTF16ToUTF8(base::StringPiece16(name)))); | 2482 routing_id_, base::UTF16ToUTF8(base::StringPiece16(name)))); |
2483 } | 2483 } |
2484 } | 2484 } |
2485 | 2485 |
2486 void RenderFrameImpl::didChangeShouldEnforceStrictMixedContentChecking( | |
2487 blink::WebLocalFrame* frame, | |
alexmos
2015/12/03 20:43:26
I think you can just remove |frame| from the arg l
estark
2015/12/04 00:19:31
Done.
| |
2488 bool shouldEnforceStrictMixedContentChecking) { | |
2489 Send(new FrameHostMsg_DidChangeShouldEnforceStrictMixedContentChecking( | |
2490 routing_id_, shouldEnforceStrictMixedContentChecking)); | |
2491 } | |
2492 | |
2486 void RenderFrameImpl::didChangeSandboxFlags(blink::WebFrame* child_frame, | 2493 void RenderFrameImpl::didChangeSandboxFlags(blink::WebFrame* child_frame, |
2487 blink::WebSandboxFlags flags) { | 2494 blink::WebSandboxFlags flags) { |
2488 Send(new FrameHostMsg_DidChangeSandboxFlags( | 2495 Send(new FrameHostMsg_DidChangeSandboxFlags( |
2489 routing_id_, GetRoutingIdForFrameOrProxy(child_frame), flags)); | 2496 routing_id_, GetRoutingIdForFrameOrProxy(child_frame), flags)); |
2490 } | 2497 } |
2491 | 2498 |
2492 void RenderFrameImpl::didChangeFrameOwnerProperties( | 2499 void RenderFrameImpl::didChangeFrameOwnerProperties( |
2493 blink::WebFrame* child_frame, | 2500 blink::WebFrame* child_frame, |
2494 const blink::WebFrameOwnerProperties& frame_owner_properties) { | 2501 const blink::WebFrameOwnerProperties& frame_owner_properties) { |
2495 Send(new FrameHostMsg_DidChangeFrameOwnerProperties( | 2502 Send(new FrameHostMsg_DidChangeFrameOwnerProperties( |
(...skipping 2918 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
5414 media::ConvertToSwitchOutputDeviceCB(web_callbacks); | 5421 media::ConvertToSwitchOutputDeviceCB(web_callbacks); |
5415 scoped_refptr<media::AudioOutputDevice> device = | 5422 scoped_refptr<media::AudioOutputDevice> device = |
5416 AudioDeviceFactory::NewOutputDevice(routing_id_, 0, sink_id.utf8(), | 5423 AudioDeviceFactory::NewOutputDevice(routing_id_, 0, sink_id.utf8(), |
5417 security_origin); | 5424 security_origin); |
5418 media::OutputDeviceStatus status = device->GetDeviceStatus(); | 5425 media::OutputDeviceStatus status = device->GetDeviceStatus(); |
5419 device->Stop(); | 5426 device->Stop(); |
5420 callback.Run(status); | 5427 callback.Run(status); |
5421 } | 5428 } |
5422 | 5429 |
5423 } // namespace content | 5430 } // namespace content |
OLD | NEW |