third_party/WebKit/Source/web/FrameLoaderClientImpl.h - Issue 1497423002: Revert of Downgrade lock icon for broken-HTTPS subresources

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

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

« no previous file with comments | « third_party/WebKit/Source/platform/network/ResourceResponse.cpp ('k') | third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 95 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
106 void didStartLoading(LoadStartType) override;	106 void didStartLoading(LoadStartType) override;

107 void didStopLoading() override;	107 void didStopLoading() override;

108 void progressEstimateChanged(double progressEstimate) override;	108 void progressEstimateChanged(double progressEstimate) override;

109 void loadURLExternally(const ResourceRequest&, NavigationPolicy, const Strin g& suggestedName, bool shouldReplaceCurrentEntry) override;	109 void loadURLExternally(const ResourceRequest&, NavigationPolicy, const Strin g& suggestedName, bool shouldReplaceCurrentEntry) override;

110 bool navigateBackForward(int offset) const override;	110 bool navigateBackForward(int offset) const override;

111 void didAccessInitialDocument() override;	111 void didAccessInitialDocument() override;

112 void didDisplayInsecureContent() override;	112 void didDisplayInsecureContent() override;

113 void didRunInsecureContent(SecurityOrigin*, const KURL& insecureURL) overrid e;	113 void didRunInsecureContent(SecurityOrigin*, const KURL& insecureURL) overrid e;

114 void didDetectXSS(const KURL&, bool didBlockEntirePage) override;	114 void didDetectXSS(const KURL&, bool didBlockEntirePage) override;

115 void didDispatchPingLoader(const KURL&) override;	115 void didDispatchPingLoader(const KURL&) override;

116 void didDisplayContentWithCertificateErrors(const KURL&, const CString& secu rityInfo, const WebURL& mainResourceUrl, const CString& mainResourceSecurityInfo ) override;

117 void didRunContentWithCertificateErrors(const KURL&, const CString& security Info, const WebURL& mainResourceUrl, const CString& mainResourceSecurityInfo) ov erride;

118 void didChangePerformanceTiming() override;	116 void didChangePerformanceTiming() override;

119 void selectorMatchChanged(const Vector<String>& addedSelectors, const Vector <String>& removedSelectors) override;	117 void selectorMatchChanged(const Vector<String>& addedSelectors, const Vector <String>& removedSelectors) override;

120 PassRefPtrWillBeRawPtr<DocumentLoader> createDocumentLoader(LocalFrame*, con st ResourceRequest&, const SubstituteData&) override;	118 PassRefPtrWillBeRawPtr<DocumentLoader> createDocumentLoader(LocalFrame*, con st ResourceRequest&, const SubstituteData&) override;

121 WTF::String userAgent() override;	119 WTF::String userAgent() override;

122 WTF::String doNotTrackValue() override;	120 WTF::String doNotTrackValue() override;

123 void transitionToCommittedForNewPage() override;	121 void transitionToCommittedForNewPage() override;

124 PassRefPtrWillBeRawPtr<LocalFrame> createFrame(const FrameLoadRequest&, cons t WTF::AtomicString& name, HTMLFrameOwnerElement*) override;	122 PassRefPtrWillBeRawPtr<LocalFrame> createFrame(const FrameLoadRequest&, cons t WTF::AtomicString& name, HTMLFrameOwnerElement*) override;

125 virtual bool canCreatePluginWithoutRenderer(const String& mimeType) const;	123 virtual bool canCreatePluginWithoutRenderer(const String& mimeType) const;

126 PassRefPtrWillBeRawPtr<Widget> createPlugin(	124 PassRefPtrWillBeRawPtr<Widget> createPlugin(

127 HTMLPlugInElement*, const KURL&,	125 HTMLPlugInElement*, const KURL&,

(...skipping 56 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
184 // The WebFrame that owns this object and manages its lifetime. Therefore,	182 // The WebFrame that owns this object and manages its lifetime. Therefore,

185 // the web frame object is guaranteed to exist.	183 // the web frame object is guaranteed to exist.

186 RawPtrWillBeMember<WebLocalFrameImpl> m_webFrame;	184 RawPtrWillBeMember<WebLocalFrameImpl> m_webFrame;

187 };	185 };

188	186

189 DEFINE_TYPE_CASTS(FrameLoaderClientImpl, FrameLoaderClient, client, client->isFr ameLoaderClientImpl(), client.isFrameLoaderClientImpl());	187 DEFINE_TYPE_CASTS(FrameLoaderClientImpl, FrameLoaderClient, client, client->isFr ameLoaderClientImpl(), client.isFrameLoaderClientImpl());

190	188

191 } // namespace blink	189 } // namespace blink

192	190

193 #endif	191 #endif

OLD	NEW