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

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

Issue 2040133003: Replace SecurityContext::InsecureRequestsPolicy with WebInsecureRequestPolicy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@combine-uir-block
Patch Set: Ugh. Created 4 years, 6 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 28 matching lines...) Expand all
39 #include "core/fetch/ResourceLoaderOptions.h" 39 #include "core/fetch/ResourceLoaderOptions.h"
40 #include "core/frame/FrameTypes.h" 40 #include "core/frame/FrameTypes.h"
41 #include "core/loader/FrameLoaderStateMachine.h" 41 #include "core/loader/FrameLoaderStateMachine.h"
42 #include "core/loader/FrameLoaderTypes.h" 42 #include "core/loader/FrameLoaderTypes.h"
43 #include "core/loader/HistoryItem.h" 43 #include "core/loader/HistoryItem.h"
44 #include "core/loader/NavigationPolicy.h" 44 #include "core/loader/NavigationPolicy.h"
45 #include "platform/Timer.h" 45 #include "platform/Timer.h"
46 #include "platform/TracedValue.h" 46 #include "platform/TracedValue.h"
47 #include "platform/heap/Handle.h" 47 #include "platform/heap/Handle.h"
48 #include "platform/network/ResourceRequest.h" 48 #include "platform/network/ResourceRequest.h"
49 #include "public/platform/WebInsecureRequestPolicy.h"
49 #include "wtf/Forward.h" 50 #include "wtf/Forward.h"
50 #include "wtf/HashSet.h" 51 #include "wtf/HashSet.h"
51 52
52 namespace blink { 53 namespace blink {
53 54
54 class DocumentLoader; 55 class DocumentLoader;
55 class Frame; 56 class Frame;
56 class FrameLoaderClient; 57 class FrameLoaderClient;
57 class ProgressTracker; 58 class ProgressTracker;
58 class ResourceError; 59 class ResourceError;
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 void dispatchDidClearWindowObjectInMainWorld(); 140 void dispatchDidClearWindowObjectInMainWorld();
140 void dispatchDidClearDocumentOfWindowObject(); 141 void dispatchDidClearDocumentOfWindowObject();
141 void dispatchDocumentElementAvailable(); 142 void dispatchDocumentElementAvailable();
142 void runScriptsAtDocumentElementAvailable(); 143 void runScriptsAtDocumentElementAvailable();
143 144
144 // The following sandbox flags will be forced, regardless of changes to 145 // The following sandbox flags will be forced, regardless of changes to
145 // the sandbox attribute of any parent frames. 146 // the sandbox attribute of any parent frames.
146 void forceSandboxFlags(SandboxFlags flags) { m_forcedSandboxFlags |= flags; } 147 void forceSandboxFlags(SandboxFlags flags) { m_forcedSandboxFlags |= flags; }
147 SandboxFlags effectiveSandboxFlags() const; 148 SandboxFlags effectiveSandboxFlags() const;
148 149
149 bool shouldEnforceStrictMixedContentChecking() const; 150 WebInsecureRequestPolicy getInsecureRequestPolicy() const;
150
151 SecurityContext::InsecureRequestsPolicy getInsecureRequestsPolicy() const;
152 SecurityContext::InsecureNavigationsSet* insecureNavigationsToUpgrade() cons t; 151 SecurityContext::InsecureNavigationsSet* insecureNavigationsToUpgrade() cons t;
153 152
154 Frame* opener(); 153 Frame* opener();
155 void setOpener(LocalFrame*); 154 void setOpener(LocalFrame*);
156 155
157 void detach(); 156 void detach();
158 157
159 void finishedParsing(); 158 void finishedParsing();
160 void checkCompleted(); 159 void checkCompleted();
161 160
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 283
285 SandboxFlags m_forcedSandboxFlags; 284 SandboxFlags m_forcedSandboxFlags;
286 285
287 bool m_dispatchingDidClearWindowObjectInMainWorld; 286 bool m_dispatchingDidClearWindowObjectInMainWorld;
288 bool m_protectProvisionalLoader; 287 bool m_protectProvisionalLoader;
289 }; 288 };
290 289
291 } // namespace blink 290 } // namespace blink
292 291
293 #endif // FrameLoader_h 292 #endif // FrameLoader_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/FrameFetchContextTest.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