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

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

Issue 1583813003: Remove obsolete histogram values from SSL.InsecureContent (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: mpearson comment Created 4 years, 11 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 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 } 257 }
258 258
259 bool FrameLoaderClientImpl::allowMedia(const KURL& mediaURL) 259 bool FrameLoaderClientImpl::allowMedia(const KURL& mediaURL)
260 { 260 {
261 if (m_webFrame->contentSettingsClient()) 261 if (m_webFrame->contentSettingsClient())
262 return m_webFrame->contentSettingsClient()->allowMedia(mediaURL); 262 return m_webFrame->contentSettingsClient()->allowMedia(mediaURL);
263 263
264 return true; 264 return true;
265 } 265 }
266 266
267 bool FrameLoaderClientImpl::allowDisplayingInsecureContent(bool enabledPerSettin gs, SecurityOrigin* context, const KURL& url) 267 bool FrameLoaderClientImpl::allowDisplayingInsecureContent(bool enabledPerSettin gs, const KURL& url)
268 { 268 {
269 if (m_webFrame->contentSettingsClient()) 269 if (m_webFrame->contentSettingsClient())
270 return m_webFrame->contentSettingsClient()->allowDisplayingInsecureConte nt(enabledPerSettings, WebSecurityOrigin(context), WebURL(url)); 270 return m_webFrame->contentSettingsClient()->allowDisplayingInsecureConte nt(enabledPerSettings, WebURL(url));
271 271
272 return enabledPerSettings; 272 return enabledPerSettings;
273 } 273 }
274 274
275 bool FrameLoaderClientImpl::allowRunningInsecureContent(bool enabledPerSettings, SecurityOrigin* context, const KURL& url) 275 bool FrameLoaderClientImpl::allowRunningInsecureContent(bool enabledPerSettings, SecurityOrigin* context, const KURL& url)
276 { 276 {
277 if (m_webFrame->contentSettingsClient()) 277 if (m_webFrame->contentSettingsClient())
278 return m_webFrame->contentSettingsClient()->allowRunningInsecureContent( enabledPerSettings, WebSecurityOrigin(context), WebURL(url)); 278 return m_webFrame->contentSettingsClient()->allowRunningInsecureContent( enabledPerSettings, WebSecurityOrigin(context), WebURL(url));
279 279
280 return enabledPerSettings; 280 return enabledPerSettings;
(...skipping 720 matching lines...) Expand 10 before | Expand all | Expand 10 after
1001 1001
1002 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde nTerminationDisablerType type) 1002 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde nTerminationDisablerType type)
1003 { 1003 {
1004 if (m_webFrame->client()) { 1004 if (m_webFrame->client()) {
1005 m_webFrame->client()->suddenTerminationDisablerChanged( 1005 m_webFrame->client()->suddenTerminationDisablerChanged(
1006 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>( type)); 1006 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>( type));
1007 } 1007 }
1008 } 1008 }
1009 1009
1010 } // namespace blink 1010 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/FrameLoaderClientImpl.h ('k') | third_party/WebKit/public/web/WebContentSettingsClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698