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

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

Issue 2625773002: Reenable framebusting (Closed)
Patch Set: Fix unit tests 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 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 SuddenTerminationDisablerType) override; 216 SuddenTerminationDisablerType) override;
217 217
218 BlameContext* frameBlameContext() override; 218 BlameContext* frameBlameContext() override;
219 219
220 LinkResource* createServiceWorkerLinkResource(HTMLLinkElement*) override; 220 LinkResource* createServiceWorkerLinkResource(HTMLLinkElement*) override;
221 221
222 WebEffectiveConnectionType getEffectiveConnectionType() override; 222 WebEffectiveConnectionType getEffectiveConnectionType() override;
223 223
224 KURL overrideFlashEmbedWithHTML(const KURL&) override; 224 KURL overrideFlashEmbedWithHTML(const KURL&) override;
225 225
226 void setHasReceivedUserGesture() override;
227
226 private: 228 private:
227 explicit FrameLoaderClientImpl(WebLocalFrameImpl*); 229 explicit FrameLoaderClientImpl(WebLocalFrameImpl*);
228 230
229 bool isFrameLoaderClientImpl() const override { return true; } 231 bool isFrameLoaderClientImpl() const override { return true; }
230 WebDevToolsAgentImpl* devToolsAgent(); 232 WebDevToolsAgentImpl* devToolsAgent();
231 233
232 // The WebFrame that owns this object and manages its lifetime. Therefore, 234 // The WebFrame that owns this object and manages its lifetime. Therefore,
233 // the web frame object is guaranteed to exist. 235 // the web frame object is guaranteed to exist.
234 Member<WebLocalFrameImpl> m_webFrame; 236 Member<WebLocalFrameImpl> m_webFrame;
235 237
236 String m_userAgent; 238 String m_userAgent;
237 }; 239 };
238 240
239 DEFINE_TYPE_CASTS(FrameLoaderClientImpl, 241 DEFINE_TYPE_CASTS(FrameLoaderClientImpl,
240 FrameLoaderClient, 242 FrameLoaderClient,
241 client, 243 client,
242 client->isFrameLoaderClientImpl(), 244 client->isFrameLoaderClientImpl(),
243 client.isFrameLoaderClientImpl()); 245 client.isFrameLoaderClientImpl());
244 246
245 } // namespace blink 247 } // namespace blink
246 248
247 #endif 249 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698