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

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

Issue 2278303002: Remove the allow-displaying-mixed-content setting from Blink. (Closed)
Patch Set: Cleanup before adding reviewers. 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 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 } 256 }
257 257
258 bool FrameLoaderClientImpl::allowImage(bool enabledPerSettings, const KURL& imag eURL) 258 bool FrameLoaderClientImpl::allowImage(bool enabledPerSettings, const KURL& imag eURL)
259 { 259 {
260 if (m_webFrame->contentSettingsClient()) 260 if (m_webFrame->contentSettingsClient())
261 return m_webFrame->contentSettingsClient()->allowImage(enabledPerSetting s, imageURL); 261 return m_webFrame->contentSettingsClient()->allowImage(enabledPerSetting s, imageURL);
262 262
263 return enabledPerSettings; 263 return enabledPerSettings;
264 } 264 }
265 265
266 bool FrameLoaderClientImpl::allowDisplayingInsecureContent(bool enabledPerSettin gs, const KURL& url)
267 {
268 if (m_webFrame->contentSettingsClient())
269 return m_webFrame->contentSettingsClient()->allowDisplayingInsecureConte nt(enabledPerSettings, WebURL(url));
270
271 return enabledPerSettings;
272 }
273
274 bool FrameLoaderClientImpl::allowRunningInsecureContent(bool enabledPerSettings, SecurityOrigin* context, const KURL& url) 266 bool FrameLoaderClientImpl::allowRunningInsecureContent(bool enabledPerSettings, SecurityOrigin* context, const KURL& url)
275 { 267 {
276 if (m_webFrame->contentSettingsClient()) 268 if (m_webFrame->contentSettingsClient())
277 return m_webFrame->contentSettingsClient()->allowRunningInsecureContent( enabledPerSettings, WebSecurityOrigin(context), WebURL(url)); 269 return m_webFrame->contentSettingsClient()->allowRunningInsecureContent( enabledPerSettings, WebSecurityOrigin(context), WebURL(url));
278 270
279 return enabledPerSettings; 271 return enabledPerSettings;
280 } 272 }
281 273
282 bool FrameLoaderClientImpl::allowAutoplay(bool defaultValue) 274 bool FrameLoaderClientImpl::allowAutoplay(bool defaultValue)
283 { 275 {
284 if (m_webFrame->contentSettingsClient()) 276 if (m_webFrame->contentSettingsClient())
285 return m_webFrame->contentSettingsClient()->allowAutoplay(defaultValue); 277 return m_webFrame->contentSettingsClient()->allowAutoplay(defaultValue);
286 278
287 return defaultValue; 279 return defaultValue;
288 } 280 }
289 281
282 void FrameLoaderClientImpl::passiveInsecureContentFound(const KURL& url)
283 {
284 if (m_webFrame->contentSettingsClient())
285 return m_webFrame->contentSettingsClient()->passiveInsecureContentFound( WebURL(url));
286 }
287
290 void FrameLoaderClientImpl::didNotAllowScript() 288 void FrameLoaderClientImpl::didNotAllowScript()
291 { 289 {
292 if (m_webFrame->contentSettingsClient()) 290 if (m_webFrame->contentSettingsClient())
293 m_webFrame->contentSettingsClient()->didNotAllowScript(); 291 m_webFrame->contentSettingsClient()->didNotAllowScript();
294 } 292 }
295 293
296 void FrameLoaderClientImpl::didNotAllowPlugins() 294 void FrameLoaderClientImpl::didNotAllowPlugins()
297 { 295 {
298 if (m_webFrame->contentSettingsClient()) 296 if (m_webFrame->contentSettingsClient())
299 m_webFrame->contentSettingsClient()->didNotAllowPlugins(); 297 m_webFrame->contentSettingsClient()->didNotAllowPlugins();
(...skipping 729 matching lines...) Expand 10 before | Expand all | Expand 10 after
1029 { 1027 {
1030 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot())-> devToolsAgentImpl(); 1028 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot())-> devToolsAgentImpl();
1031 } 1029 }
1032 1030
1033 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) 1031 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url)
1034 { 1032 {
1035 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); 1033 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url));
1036 } 1034 }
1037 1035
1038 } // namespace blink 1036 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698