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

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 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 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 m_webFrame->contentSettingsClient()->didNotAllowScript(); 286 m_webFrame->contentSettingsClient()->didNotAllowScript();
287 } 287 }
288 288
289 void FrameLoaderClientImpl::didNotAllowPlugins() 289 void FrameLoaderClientImpl::didNotAllowPlugins()
290 { 290 {
291 if (m_webFrame->contentSettingsClient()) 291 if (m_webFrame->contentSettingsClient())
292 m_webFrame->contentSettingsClient()->didNotAllowPlugins(); 292 m_webFrame->contentSettingsClient()->didNotAllowPlugins();
293 293
294 } 294 }
295 295
296 void FrameLoaderClientImpl::didUseKeygen()
297 {
298 if (m_webFrame->contentSettingsClient())
299 m_webFrame->contentSettingsClient()->didUseKeygen();
300 }
301
296 bool FrameLoaderClientImpl::hasWebView() const 302 bool FrameLoaderClientImpl::hasWebView() const
297 { 303 {
298 return m_webFrame->viewImpl(); 304 return m_webFrame->viewImpl();
299 } 305 }
300 306
301 bool FrameLoaderClientImpl::inShadowTree() const 307 bool FrameLoaderClientImpl::inShadowTree() const
302 { 308 {
303 return m_webFrame->inShadowTree(); 309 return m_webFrame->inShadowTree();
304 } 310 }
305 311
(...skipping 689 matching lines...) Expand 10 before | Expand all | Expand 10 after
995 1001
996 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde nTerminationDisablerType type) 1002 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde nTerminationDisablerType type)
997 { 1003 {
998 if (m_webFrame->client()) { 1004 if (m_webFrame->client()) {
999 m_webFrame->client()->suddenTerminationDisablerChanged( 1005 m_webFrame->client()->suddenTerminationDisablerChanged(
1000 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>( type)); 1006 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>( type));
1001 } 1007 }
1002 } 1008 }
1003 1009
1004 } // 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