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

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

Issue 2278303002: Remove the allow-displaying-mixed-content setting from Blink. (Closed)
Patch Set: Fixed missign deprecated preference registration. Created 4 years, 3 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 /* 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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 std::unique_ptr<WebMediaPlayer> createWebMediaPlayer(HTMLMediaElement&, cons t WebMediaPlayerSource&, WebMediaPlayerClient*) override; 132 std::unique_ptr<WebMediaPlayer> createWebMediaPlayer(HTMLMediaElement&, cons t WebMediaPlayerSource&, WebMediaPlayerClient*) override;
133 std::unique_ptr<WebMediaSession> createWebMediaSession() override; 133 std::unique_ptr<WebMediaSession> createWebMediaSession() override;
134 ObjectContentType getObjectContentType( 134 ObjectContentType getObjectContentType(
135 const KURL&, const WTF::String& mimeType, bool shouldPreferPlugInsForIma ges) override; 135 const KURL&, const WTF::String& mimeType, bool shouldPreferPlugInsForIma ges) override;
136 void didChangeScrollOffset() override; 136 void didChangeScrollOffset() override;
137 void didUpdateCurrentHistoryItem() override; 137 void didUpdateCurrentHistoryItem() override;
138 bool allowScript(bool enabledPerSettings) override; 138 bool allowScript(bool enabledPerSettings) override;
139 bool allowScriptFromSource(bool enabledPerSettings, const KURL& scriptURL) o verride; 139 bool allowScriptFromSource(bool enabledPerSettings, const KURL& scriptURL) o verride;
140 bool allowPlugins(bool enabledPerSettings) override; 140 bool allowPlugins(bool enabledPerSettings) override;
141 bool allowImage(bool enabledPerSettings, const KURL& imageURL) override; 141 bool allowImage(bool enabledPerSettings, const KURL& imageURL) override;
142 bool allowDisplayingInsecureContent(bool enabledPerSettings, const KURL&) ov erride;
143 bool allowRunningInsecureContent(bool enabledPerSettings, SecurityOrigin*, c onst KURL&) override; 142 bool allowRunningInsecureContent(bool enabledPerSettings, SecurityOrigin*, c onst KURL&) override;
144 bool allowAutoplay(bool defaultValue) override; 143 bool allowAutoplay(bool defaultValue) override;
144 void passiveInsecureContentFound(const KURL&) override;
145 void didNotAllowScript() override; 145 void didNotAllowScript() override;
146 void didNotAllowPlugins() override; 146 void didNotAllowPlugins() override;
147 void didUseKeygen() override; 147 void didUseKeygen() override;
148 148
149 WebCookieJar* cookieJar() const override; 149 WebCookieJar* cookieJar() const override;
150 void frameFocused() const override; 150 void frameFocused() const override;
151 void didChangeName(const String& name, const String& uniqueName) override; 151 void didChangeName(const String& name, const String& uniqueName) override;
152 void didEnforceInsecureRequestPolicy(WebInsecureRequestPolicy) override; 152 void didEnforceInsecureRequestPolicy(WebInsecureRequestPolicy) override;
153 void didUpdateToUniqueOrigin() override; 153 void didUpdateToUniqueOrigin() override;
154 void didChangeSandboxFlags(Frame* childFrame, SandboxFlags) override; 154 void didChangeSandboxFlags(Frame* childFrame, SandboxFlags) override;
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 Member<WebLocalFrameImpl> m_webFrame; 193 Member<WebLocalFrameImpl> m_webFrame;
194 194
195 String m_userAgent; 195 String m_userAgent;
196 }; 196 };
197 197
198 DEFINE_TYPE_CASTS(FrameLoaderClientImpl, FrameLoaderClient, client, client->isFr ameLoaderClientImpl(), client.isFrameLoaderClientImpl()); 198 DEFINE_TYPE_CASTS(FrameLoaderClientImpl, FrameLoaderClient, client, client->isFr ameLoaderClientImpl(), client.isFrameLoaderClientImpl());
199 199
200 } // namespace blink 200 } // namespace blink
201 201
202 #endif 202 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/MixedContentChecker.cpp ('k') | third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698