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

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

Issue 2254693002: Delay generation of User-Agent header to URLRequestHttpJob and accept custom User-Agent from XHR/Fe… Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changed Android test Created 4 years, 3 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. (http://www.t orchmobile.com/) 3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
4 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 4 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
5 * Copyright (C) 2011 Google Inc. All rights reserved. 5 * Copyright (C) 2011 Google Inc. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 10 *
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 160
161 // This prepares the FrameLoader for the next commit. It will dispatch 161 // This prepares the FrameLoader for the next commit. It will dispatch
162 // unload events, abort XHR requests and detach the document. Returns true 162 // unload events, abort XHR requests and detach the document. Returns true
163 // if the frame is ready to receive the next commit, or false otherwise. 163 // if the frame is ready to receive the next commit, or false otherwise.
164 bool prepareForCommit(); 164 bool prepareForCommit();
165 165
166 void commitProvisionalLoad(); 166 void commitProvisionalLoad();
167 167
168 FrameLoaderStateMachine* stateMachine() const { return &m_stateMachine; } 168 FrameLoaderStateMachine* stateMachine() const { return &m_stateMachine; }
169 169
170 void applyUserAgent(ResourceRequest&);
171
172 bool shouldInterruptLoadForXFrameOptions(const String&, const KURL&, unsigne d long requestIdentifier); 170 bool shouldInterruptLoadForXFrameOptions(const String&, const KURL&, unsigne d long requestIdentifier);
173 171
174 bool allAncestorsAreComplete() const; // including this 172 bool allAncestorsAreComplete() const; // including this
175 173
176 bool shouldClose(bool isReload = false); 174 bool shouldClose(bool isReload = false);
177 void dispatchUnloadEvent(); 175 void dispatchUnloadEvent();
178 176
179 bool allowPlugins(ReasonForCallingAllowPlugins); 177 bool allowPlugins(ReasonForCallingAllowPlugins);
180 178
181 void updateForSameDocumentNavigation(const KURL&, SameDocumentNavigationSour ce, PassRefPtr<SerializedScriptValue>, HistoryScrollRestorationType, FrameLoadTy pe, Document*); 179 void updateForSameDocumentNavigation(const KURL&, SameDocumentNavigationSour ce, PassRefPtr<SerializedScriptValue>, HistoryScrollRestorationType, FrameLoadTy pe, Document*);
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 279
282 SandboxFlags m_forcedSandboxFlags; 280 SandboxFlags m_forcedSandboxFlags;
283 281
284 bool m_dispatchingDidClearWindowObjectInMainWorld; 282 bool m_dispatchingDidClearWindowObjectInMainWorld;
285 bool m_protectProvisionalLoader; 283 bool m_protectProvisionalLoader;
286 }; 284 };
287 285
288 } // namespace blink 286 } // namespace blink
289 287
290 #endif // FrameLoader_h 288 #endif // FrameLoader_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698