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

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

Issue 1550233002: Move mixed content settings histograms into browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: typo fix Created 4 years, 11 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
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 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 2586 matching lines...) Expand 10 before | Expand all | Expand 10 after
2597 frame_ = nullptr; 2597 frame_ = nullptr;
2598 2598
2599 delete this; 2599 delete this;
2600 // Object is invalid after this point. 2600 // Object is invalid after this point.
2601 } 2601 }
2602 2602
2603 void RenderFrameImpl::frameFocused() { 2603 void RenderFrameImpl::frameFocused() {
2604 Send(new FrameHostMsg_FrameFocused(routing_id_)); 2604 Send(new FrameHostMsg_FrameFocused(routing_id_));
2605 } 2605 }
2606 2606
2607 void RenderFrameImpl::triedDisplayingInsecureContent(
2608 const blink::WebSecurityOrigin& origin,
2609 const blink::WebURL& url) {
2610 Send(new FrameHostMsg_TriedDisplayingInsecureContent(
2611 routing_id_, GURL(origin.toString().utf8()), url));
alexmos 2016/01/09 01:39:02 If we do end up passing origin through this, it's
2612 }
2613
2614 void RenderFrameImpl::triedRunningInsecureContent(
2615 const blink::WebSecurityOrigin& origin,
2616 const blink::WebURL& url) {
2617 Send(new FrameHostMsg_TriedRunningInsecureContent(
2618 routing_id_, GURL(origin.toString().utf8()), url));
2619 }
2620
2607 void RenderFrameImpl::willClose(blink::WebFrame* frame) { 2621 void RenderFrameImpl::willClose(blink::WebFrame* frame) {
2608 DCHECK(!frame_ || frame_ == frame); 2622 DCHECK(!frame_ || frame_ == frame);
2609 2623
2610 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, FrameWillClose()); 2624 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, FrameWillClose());
2611 FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers(), 2625 FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers(),
2612 FrameWillClose(frame)); 2626 FrameWillClose(frame));
2613 } 2627 }
2614 2628
2615 void RenderFrameImpl::didChangeName(blink::WebLocalFrame* frame, 2629 void RenderFrameImpl::didChangeName(blink::WebLocalFrame* frame,
2616 const blink::WebString& name) { 2630 const blink::WebString& name) {
(...skipping 3067 matching lines...) Expand 10 before | Expand all | Expand 10 after
5684 media::ConvertToSwitchOutputDeviceCB(web_callbacks); 5698 media::ConvertToSwitchOutputDeviceCB(web_callbacks);
5685 scoped_refptr<media::AudioOutputDevice> device = 5699 scoped_refptr<media::AudioOutputDevice> device =
5686 AudioDeviceFactory::NewOutputDevice(routing_id_, 0, sink_id.utf8(), 5700 AudioDeviceFactory::NewOutputDevice(routing_id_, 0, sink_id.utf8(),
5687 security_origin); 5701 security_origin);
5688 media::OutputDeviceStatus status = device->GetDeviceStatus(); 5702 media::OutputDeviceStatus status = device->GetDeviceStatus();
5689 device->Stop(); 5703 device->Stop();
5690 callback.Run(status); 5704 callback.Run(status);
5691 } 5705 }
5692 5706
5693 } // namespace content 5707 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698