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

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: Rebase? 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 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 m_webFrame->contentSettingsClient()->didNotAllowScript(); 273 m_webFrame->contentSettingsClient()->didNotAllowScript();
274 } 274 }
275 275
276 void FrameLoaderClientImpl::didNotAllowPlugins() 276 void FrameLoaderClientImpl::didNotAllowPlugins()
277 { 277 {
278 if (m_webFrame->contentSettingsClient()) 278 if (m_webFrame->contentSettingsClient())
279 m_webFrame->contentSettingsClient()->didNotAllowPlugins(); 279 m_webFrame->contentSettingsClient()->didNotAllowPlugins();
280 280
281 } 281 }
282 282
283 void FrameLoaderClientImpl::usedKeygen()
284 {
285 if (m_webFrame->contentSettingsClient())
286 m_webFrame->contentSettingsClient()->usedKeygen();
287 }
288
283 bool FrameLoaderClientImpl::hasWebView() const 289 bool FrameLoaderClientImpl::hasWebView() const
284 { 290 {
285 return m_webFrame->viewImpl(); 291 return m_webFrame->viewImpl();
286 } 292 }
287 293
288 bool FrameLoaderClientImpl::inShadowTree() const 294 bool FrameLoaderClientImpl::inShadowTree() const
289 { 295 {
290 return m_webFrame->inShadowTree(); 296 return m_webFrame->inShadowTree();
291 } 297 }
292 298
(...skipping 692 matching lines...) Expand 10 before | Expand all | Expand 10 after
985 991
986 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde nTerminationDisablerType type) 992 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde nTerminationDisablerType type)
987 { 993 {
988 if (m_webFrame->client()) { 994 if (m_webFrame->client()) {
989 m_webFrame->client()->suddenTerminationDisablerChanged( 995 m_webFrame->client()->suddenTerminationDisablerChanged(
990 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>( type)); 996 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>( type));
991 } 997 }
992 } 998 }
993 999
994 } // namespace blink 1000 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698