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

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

Issue 1417033010: Adding <keygen> Content Setting (Blink) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@keygen_core
Patch Set: Clean up code. Created 5 years, 1 month 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 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 } 215 }
216 216
217 bool FrameLoaderClientImpl::allowScriptFromSource(bool enabledPerSettings, const KURL& scriptURL) 217 bool FrameLoaderClientImpl::allowScriptFromSource(bool enabledPerSettings, const KURL& scriptURL)
218 { 218 {
219 if (m_webFrame->contentSettingsClient()) 219 if (m_webFrame->contentSettingsClient())
220 return m_webFrame->contentSettingsClient()->allowScriptFromSource(enable dPerSettings, scriptURL); 220 return m_webFrame->contentSettingsClient()->allowScriptFromSource(enable dPerSettings, scriptURL);
221 221
222 return enabledPerSettings; 222 return enabledPerSettings;
223 } 223 }
224 224
225 bool FrameLoaderClientImpl::allowKeygen()
226 {
227 if (m_webFrame->contentSettingsClient())
228 return m_webFrame->contentSettingsClient()->allowKeygen();
229 return false;
230 }
231
225 bool FrameLoaderClientImpl::allowPlugins(bool enabledPerSettings) 232 bool FrameLoaderClientImpl::allowPlugins(bool enabledPerSettings)
226 { 233 {
227 if (m_webFrame->contentSettingsClient()) 234 if (m_webFrame->contentSettingsClient())
228 return m_webFrame->contentSettingsClient()->allowPlugins(enabledPerSetti ngs); 235 return m_webFrame->contentSettingsClient()->allowPlugins(enabledPerSetti ngs);
229 236
230 return enabledPerSettings; 237 return enabledPerSettings;
231 } 238 }
232 239
233 bool FrameLoaderClientImpl::allowImage(bool enabledPerSettings, const KURL& imag eURL) 240 bool FrameLoaderClientImpl::allowImage(bool enabledPerSettings, const KURL& imag eURL)
234 { 241 {
(...skipping 26 matching lines...) Expand all
261 268
262 return enabledPerSettings; 269 return enabledPerSettings;
263 } 270 }
264 271
265 void FrameLoaderClientImpl::didNotAllowScript() 272 void FrameLoaderClientImpl::didNotAllowScript()
266 { 273 {
267 if (m_webFrame->contentSettingsClient()) 274 if (m_webFrame->contentSettingsClient())
268 m_webFrame->contentSettingsClient()->didNotAllowScript(); 275 m_webFrame->contentSettingsClient()->didNotAllowScript();
269 } 276 }
270 277
278 void FrameLoaderClientImpl::didNotAllowKeygen()
279 {
280 if (m_webFrame->contentSettingsClient())
281 m_webFrame->contentSettingsClient()->didNotAllowKeygen();
282 }
283
271 void FrameLoaderClientImpl::didNotAllowPlugins() 284 void FrameLoaderClientImpl::didNotAllowPlugins()
272 { 285 {
273 if (m_webFrame->contentSettingsClient()) 286 if (m_webFrame->contentSettingsClient())
274 m_webFrame->contentSettingsClient()->didNotAllowPlugins(); 287 m_webFrame->contentSettingsClient()->didNotAllowPlugins();
275 288
276 } 289 }
277 290
278 bool FrameLoaderClientImpl::hasWebView() const 291 bool FrameLoaderClientImpl::hasWebView() const
279 { 292 {
280 return m_webFrame->viewImpl(); 293 return m_webFrame->viewImpl();
(...skipping 685 matching lines...) Expand 10 before | Expand all | Expand 10 after
966 979
967 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde nTerminationDisablerType type) 980 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde nTerminationDisablerType type)
968 { 981 {
969 if (m_webFrame->client()) { 982 if (m_webFrame->client()) {
970 m_webFrame->client()->suddenTerminationDisablerChanged( 983 m_webFrame->client()->suddenTerminationDisablerChanged(
971 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>( type)); 984 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>( type));
972 } 985 }
973 } 986 }
974 987
975 } // namespace blink 988 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698