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

Side by Side Diff: third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

Issue 1497423002: Revert of Downgrade lock icon for broken-HTTPS subresources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix conflict Created 5 years 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 /* 1 /*
2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
3 * Copyright (C) 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2011 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 659 matching lines...) Expand 10 before | Expand all | Expand 10 after
670 if (m_webFrame->client()) 670 if (m_webFrame->client())
671 m_webFrame->client()->didDetectXSS(insecureURL, didBlockEntirePage); 671 m_webFrame->client()->didDetectXSS(insecureURL, didBlockEntirePage);
672 } 672 }
673 673
674 void FrameLoaderClientImpl::didDispatchPingLoader(const KURL& url) 674 void FrameLoaderClientImpl::didDispatchPingLoader(const KURL& url)
675 { 675 {
676 if (m_webFrame->client()) 676 if (m_webFrame->client())
677 m_webFrame->client()->didDispatchPingLoader(m_webFrame, url); 677 m_webFrame->client()->didDispatchPingLoader(m_webFrame, url);
678 } 678 }
679 679
680 void FrameLoaderClientImpl::didDisplayContentWithCertificateErrors(const KURL& u rl, const CString& securityInfo, const WebURL& mainResourceUrl, const CString& m ainResourceSecurityInfo)
681 {
682 if (m_webFrame->client())
683 m_webFrame->client()->didDisplayContentWithCertificateErrors(url, securi tyInfo, mainResourceUrl, mainResourceSecurityInfo);
684 }
685
686 void FrameLoaderClientImpl::didRunContentWithCertificateErrors(const KURL& url, const CString& securityInfo, const WebURL& mainResourceUrl, const CString& mainR esourceSecurityInfo)
687 {
688 if (m_webFrame->client())
689 m_webFrame->client()->didRunContentWithCertificateErrors(url, securityIn fo, mainResourceUrl, mainResourceSecurityInfo);
690 }
691
692 void FrameLoaderClientImpl::didChangePerformanceTiming() 680 void FrameLoaderClientImpl::didChangePerformanceTiming()
693 { 681 {
694 if (m_webFrame->client()) 682 if (m_webFrame->client())
695 m_webFrame->client()->didChangePerformanceTiming(); 683 m_webFrame->client()->didChangePerformanceTiming();
696 } 684 }
697 685
698 void FrameLoaderClientImpl::selectorMatchChanged(const Vector<String>& addedSele ctors, const Vector<String>& removedSelectors) 686 void FrameLoaderClientImpl::selectorMatchChanged(const Vector<String>& addedSele ctors, const Vector<String>& removedSelectors)
699 { 687 {
700 if (WebFrameClient* client = m_webFrame->client()) 688 if (WebFrameClient* client = m_webFrame->client())
701 client->didMatchCSS(m_webFrame, WebVector<WebString>(addedSelectors), We bVector<WebString>(removedSelectors)); 689 client->didMatchCSS(m_webFrame, WebVector<WebString>(addedSelectors), We bVector<WebString>(removedSelectors));
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
991 979
992 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde nTerminationDisablerType type) 980 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde nTerminationDisablerType type)
993 { 981 {
994 if (m_webFrame->client()) { 982 if (m_webFrame->client()) {
995 m_webFrame->client()->suddenTerminationDisablerChanged( 983 m_webFrame->client()->suddenTerminationDisablerChanged(
996 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>( type)); 984 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>( type));
997 } 985 }
998 } 986 }
999 987
1000 } // namespace blink 988 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/FrameLoaderClientImpl.h ('k') | third_party/WebKit/public/platform/WebURLResponse.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698