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

Side by Side Diff: third_party/WebKit/Source/core/loader/FrameLoader.h

Issue 2781723007: Plumb initiator out of Blink. (Closed)
Patch Set: Created 3 years, 8 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) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved.
3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
4 * (http://www.torchmobile.com/) 4 * (http://www.torchmobile.com/)
5 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 5 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
6 * Copyright (C) 2011 Google Inc. All rights reserved. 6 * Copyright (C) 2011 Google Inc. All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 Document*); 196 Document*);
197 197
198 HistoryItem* currentItem() const { return m_currentItem.get(); } 198 HistoryItem* currentItem() const { return m_currentItem.get(); }
199 void saveScrollState(); 199 void saveScrollState();
200 200
201 void restoreScrollPositionAndViewState(); 201 void restoreScrollPositionAndViewState();
202 202
203 // The navigation should only be continued immediately in this frame if this 203 // The navigation should only be continued immediately in this frame if this
204 // returns NavigationPolicyCurrentTab. 204 // returns NavigationPolicyCurrentTab.
205 NavigationPolicy shouldContinueForNavigationPolicy( 205 NavigationPolicy shouldContinueForNavigationPolicy(
206 Document* originDocument,
206 const ResourceRequest&, 207 const ResourceRequest&,
207 const SubstituteData&, 208 const SubstituteData&,
208 DocumentLoader*, 209 DocumentLoader*,
209 ContentSecurityPolicyDisposition, 210 ContentSecurityPolicyDisposition,
210 NavigationType, 211 NavigationType,
211 NavigationPolicy, 212 NavigationPolicy,
212 FrameLoadType, 213 FrameLoadType,
213 bool isClientRedirect, 214 bool isClientRedirect,
214 HTMLFormElement*); 215 HTMLFormElement*);
215 216
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 328
328 SandboxFlags m_forcedSandboxFlags; 329 SandboxFlags m_forcedSandboxFlags;
329 330
330 bool m_dispatchingDidClearWindowObjectInMainWorld; 331 bool m_dispatchingDidClearWindowObjectInMainWorld;
331 bool m_protectProvisionalLoader; 332 bool m_protectProvisionalLoader;
332 }; 333 };
333 334
334 } // namespace blink 335 } // namespace blink
335 336
336 #endif // FrameLoader_h 337 #endif // FrameLoader_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/EmptyClients.cpp ('k') | third_party/WebKit/Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698