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

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

Issue 1415923015: Downgrade lock icon for broken-HTTPS subresources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove unnecessary includes Created 5 years, 1 month 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 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 3614 matching lines...) Expand 10 before | Expand all | Expand 10 after
3625 void RenderFrameImpl::didRunInsecureContent( 3625 void RenderFrameImpl::didRunInsecureContent(
3626 const blink::WebSecurityOrigin& origin, 3626 const blink::WebSecurityOrigin& origin,
3627 const blink::WebURL& target) { 3627 const blink::WebURL& target) {
3628 Send(new FrameHostMsg_DidRunInsecureContent( 3628 Send(new FrameHostMsg_DidRunInsecureContent(
3629 routing_id_, origin.toString().utf8(), target)); 3629 routing_id_, origin.toString().utf8(), target));
3630 GetContentClient()->renderer()->RecordRapporURL( 3630 GetContentClient()->renderer()->RecordRapporURL(
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::didDisplayContentWithCertificateErrors(
3636 const blink::WebURL& url,
3637 const blink::WebCString& security_info) {
3638 Send(new FrameHostMsg_DidDisplayContentWithCertificateErrors(routing_id_, url,
3639 security_info));
3640 }
3641
3642 void RenderFrameImpl::didRunContentWithCertificateErrors(
3643 const blink::WebSecurityOrigin& origin,
3644 const blink::WebURL& url,
3645 const blink::WebCString& security_info) {
3646 Send(new FrameHostMsg_DidRunContentWithCertificateErrors(
3647 routing_id_, origin.toString().utf8(), url, security_info));
jww 2015/11/20 01:25:08 As I said earlier, I think it would make much more
estark 2015/11/23 23:40:24 Done.
3648 }
3649
3635 void RenderFrameImpl::didChangePerformanceTiming() { 3650 void RenderFrameImpl::didChangePerformanceTiming() {
3636 FOR_EACH_OBSERVER(RenderFrameObserver, 3651 FOR_EACH_OBSERVER(RenderFrameObserver,
3637 observers_, 3652 observers_,
3638 DidChangePerformanceTiming()); 3653 DidChangePerformanceTiming());
3639 } 3654 }
3640 3655
3641 void RenderFrameImpl::didAbortLoading(blink::WebLocalFrame* frame) { 3656 void RenderFrameImpl::didAbortLoading(blink::WebLocalFrame* frame) {
3642 DCHECK(!frame_ || frame_ == frame); 3657 DCHECK(!frame_ || frame_ == frame);
3643 #if defined(ENABLE_PLUGINS) 3658 #if defined(ENABLE_PLUGINS)
3644 if (frame != render_view_->webview()->mainFrame()) 3659 if (frame != render_view_->webview()->mainFrame())
(...skipping 1716 matching lines...) Expand 10 before | Expand all | Expand 10 after
5361 media::ConvertToSwitchOutputDeviceCB(web_callbacks); 5376 media::ConvertToSwitchOutputDeviceCB(web_callbacks);
5362 scoped_refptr<media::AudioOutputDevice> device = 5377 scoped_refptr<media::AudioOutputDevice> device =
5363 AudioDeviceFactory::NewOutputDevice(routing_id_, 0, sink_id.utf8(), 5378 AudioDeviceFactory::NewOutputDevice(routing_id_, 0, sink_id.utf8(),
5364 security_origin); 5379 security_origin);
5365 media::OutputDeviceStatus status = device->GetDeviceStatus(); 5380 media::OutputDeviceStatus status = device->GetDeviceStatus();
5366 device->Stop(); 5381 device->Stop();
5367 callback.Run(status); 5382 callback.Run(status);
5368 } 5383 }
5369 5384
5370 } // namespace content 5385 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698