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

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

Issue 2625773002: Reenable framebusting (Closed)
Patch Set: Pass through FrameReplicationState Created 3 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 980 matching lines...) Expand 10 before | Expand all | Expand 10 after
991 991
992 WebDevToolsAgentImpl* FrameLoaderClientImpl::devToolsAgent() { 992 WebDevToolsAgentImpl* FrameLoaderClientImpl::devToolsAgent() {
993 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot()) 993 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot())
994 ->devToolsAgentImpl(); 994 ->devToolsAgentImpl();
995 } 995 }
996 996
997 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) { 997 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) {
998 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); 998 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url));
999 } 999 }
1000 1000
1001 void FrameLoaderClientImpl::setHasReceivedUserGesture() {
1002 if (m_webFrame->client())
1003 m_webFrame->client()->setHasReceivedUserGesture();
1004 }
1005
1001 } // namespace blink 1006 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/FrameLoaderClientImpl.h ('k') | third_party/WebKit/Source/web/RemoteFrameClientImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698