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

Side by Side Diff: third_party/WebKit/Source/core/loader/FrameLoaderClient.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) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
3 * Copyright (C) 2012 Google Inc. All rights reserved. 3 * Copyright (C) 2012 Google 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 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. 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 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 virtual bool allowScriptExtension(const String& extensionName, int extension Group, int worldId) = 0; 190 virtual bool allowScriptExtension(const String& extensionName, int extension Group, int worldId) = 0;
191 191
192 virtual void didChangeScrollOffset() { } 192 virtual void didChangeScrollOffset() { }
193 virtual void didUpdateCurrentHistoryItem() { } 193 virtual void didUpdateCurrentHistoryItem() { }
194 194
195 virtual bool allowScript(bool enabledPerSettings) { return enabledPerSetting s; } 195 virtual bool allowScript(bool enabledPerSettings) { return enabledPerSetting s; }
196 virtual bool allowScriptFromSource(bool enabledPerSettings, const KURL&) { r eturn enabledPerSettings; } 196 virtual bool allowScriptFromSource(bool enabledPerSettings, const KURL&) { r eturn enabledPerSettings; }
197 virtual bool allowPlugins(bool enabledPerSettings) { return enabledPerSettin gs; } 197 virtual bool allowPlugins(bool enabledPerSettings) { return enabledPerSettin gs; }
198 virtual bool allowImage(bool enabledPerSettings, const KURL&) { return enabl edPerSettings; } 198 virtual bool allowImage(bool enabledPerSettings, const KURL&) { return enabl edPerSettings; }
199 virtual bool allowMedia(const KURL&) { return true; } 199 virtual bool allowMedia(const KURL&) { return true; }
200 virtual bool allowDisplayingInsecureContent(bool enabledPerSettings, const K URL&) { return enabledPerSettings; }
201 virtual bool allowRunningInsecureContent(bool enabledPerSettings, SecurityOr igin*, const KURL&) { return enabledPerSettings; } 200 virtual bool allowRunningInsecureContent(bool enabledPerSettings, SecurityOr igin*, const KURL&) { return enabledPerSettings; }
202 virtual bool allowAutoplay(bool defaultValue) { return defaultValue; } 201 virtual bool allowAutoplay(bool defaultValue) { return defaultValue; }
203 202
203 // Reports that passive mixed content was found at the provided URL. It may
204 // or may not be actually displayed later, what would be flagged by
205 // didDisplayInsecureContent.
206 virtual void passiveInsecureContentFound(const KURL&) {}
207
204 // This callback notifies the client that the frame was about to run 208 // This callback notifies the client that the frame was about to run
205 // JavaScript but did not because allowScript returned false. We 209 // JavaScript but did not because allowScript returned false. We
206 // have a separate callback here because there are a number of places 210 // have a separate callback here because there are a number of places
207 // that need to know if JavaScript is enabled but are not necessarily 211 // that need to know if JavaScript is enabled but are not necessarily
208 // preparing to execute script. 212 // preparing to execute script.
209 virtual void didNotAllowScript() { } 213 virtual void didNotAllowScript() { }
210 // This callback is similar, but for plugins. 214 // This callback is similar, but for plugins.
211 virtual void didNotAllowPlugins() { } 215 virtual void didNotAllowPlugins() { }
212 216
213 // This callback notifies the client that the frame created a Keygen element . 217 // This callback notifies the client that the frame created a Keygen element .
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 virtual WebEffectiveConnectionType getEffectiveConnectionType() { return Web EffectiveConnectionType::TypeUnknown; } 273 virtual WebEffectiveConnectionType getEffectiveConnectionType() { return Web EffectiveConnectionType::TypeUnknown; }
270 274
271 // Overwrites the given URL to use an HTML5 embed if possible. 275 // Overwrites the given URL to use an HTML5 embed if possible.
272 // An empty URL is returned if the URL is not overriden. 276 // An empty URL is returned if the URL is not overriden.
273 virtual KURL overrideFlashEmbedWithHTML(const KURL&) { return KURL(); } 277 virtual KURL overrideFlashEmbedWithHTML(const KURL&) { return KURL(); }
274 }; 278 };
275 279
276 } // namespace blink 280 } // namespace blink
277 281
278 #endif // FrameLoaderClient_h 282 #endif // FrameLoaderClient_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/Settings.in ('k') | third_party/WebKit/Source/core/loader/MixedContentChecker.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698