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

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

Issue 1738613002: Rename enums/functions that collide in chromium style in core/dom/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-3
Patch Set: get-names-4: Created 4 years, 9 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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 void dispatchDidClearDocumentOfWindowObject(); 137 void dispatchDidClearDocumentOfWindowObject();
138 void dispatchDocumentElementAvailable(); 138 void dispatchDocumentElementAvailable();
139 139
140 // The following sandbox flags will be forced, regardless of changes to 140 // The following sandbox flags will be forced, regardless of changes to
141 // the sandbox attribute of any parent frames. 141 // the sandbox attribute of any parent frames.
142 void forceSandboxFlags(SandboxFlags flags) { m_forcedSandboxFlags |= flags; } 142 void forceSandboxFlags(SandboxFlags flags) { m_forcedSandboxFlags |= flags; }
143 SandboxFlags effectiveSandboxFlags() const; 143 SandboxFlags effectiveSandboxFlags() const;
144 144
145 bool shouldEnforceStrictMixedContentChecking() const; 145 bool shouldEnforceStrictMixedContentChecking() const;
146 146
147 SecurityContext::InsecureRequestsPolicy insecureRequestsPolicy() const; 147 SecurityContext::InsecureRequestsPolicy getInsecureRequestsPolicy() const;
148 SecurityContext::InsecureNavigationsSet* insecureNavigationsToUpgrade() cons t; 148 SecurityContext::InsecureNavigationsSet* insecureNavigationsToUpgrade() cons t;
149 149
150 Frame* opener(); 150 Frame* opener();
151 void setOpener(LocalFrame*); 151 void setOpener(LocalFrame*);
152 152
153 void detach(); 153 void detach();
154 154
155 void finishedParsing(); 155 void finishedParsing();
156 void checkCompleted(); 156 void checkCompleted();
157 157
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 Timer<FrameLoader> m_didAccessInitialDocumentTimer; 276 Timer<FrameLoader> m_didAccessInitialDocumentTimer;
277 277
278 SandboxFlags m_forcedSandboxFlags; 278 SandboxFlags m_forcedSandboxFlags;
279 279
280 bool m_dispatchingDidClearWindowObjectInMainWorld; 280 bool m_dispatchingDidClearWindowObjectInMainWorld;
281 }; 281 };
282 282
283 } // namespace blink 283 } // namespace blink
284 284
285 #endif // FrameLoader_h 285 #endif // FrameLoader_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698