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

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

Issue 2877893002: Make UseCounter take a LocaFrame instead of any Frame (Closed)
Patch Set: Fix compile Created 3 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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 WebURLRequest::RequestContext, 115 WebURLRequest::RequestContext,
116 bool was_allowed, 116 bool was_allowed,
117 bool had_redirect, 117 bool had_redirect,
118 std::unique_ptr<SourceLocation>); 118 std::unique_ptr<SourceLocation>);
119 119
120 private: 120 private:
121 FRIEND_TEST_ALL_PREFIXES(MixedContentCheckerTest, HandleCertificateError); 121 FRIEND_TEST_ALL_PREFIXES(MixedContentCheckerTest, HandleCertificateError);
122 122
123 static Frame* InWhichFrameIsContentMixed(Frame*, 123 static Frame* InWhichFrameIsContentMixed(Frame*,
124 WebURLRequest::FrameType, 124 WebURLRequest::FrameType,
125 const KURL&); 125 const KURL&,
126 const LocalFrame*);
126 127
127 static void LogToConsoleAboutFetch(LocalFrame*, 128 static void LogToConsoleAboutFetch(LocalFrame*,
128 const KURL&, 129 const KURL&,
129 const KURL&, 130 const KURL&,
130 WebURLRequest::RequestContext, 131 WebURLRequest::RequestContext,
131 bool allowed, 132 bool allowed,
132 std::unique_ptr<SourceLocation>); 133 std::unique_ptr<SourceLocation>);
133 static void LogToConsoleAboutWebSocket(LocalFrame*, 134 static void LogToConsoleAboutWebSocket(LocalFrame*,
134 const KURL&, 135 const KURL&,
135 const KURL&, 136 const KURL&,
136 bool allowed); 137 bool allowed);
137 static void Count(Frame*, WebURLRequest::RequestContext); 138 static void Count(Frame*, WebURLRequest::RequestContext, const LocalFrame*);
138 }; 139 };
139 140
140 } // namespace blink 141 } // namespace blink
141 142
142 #endif // MixedContentChecker_h 143 #endif // MixedContentChecker_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/UseCounter.cpp ('k') | third_party/WebKit/Source/core/loader/MixedContentChecker.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698