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

Side by Side Diff: Source/core/loader/MixedContentChecker.cpp

Issue 54053006: Move weborigin/ under platform/ so that it may someday call platform APIs (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Stale refernence to weboriginexport in .gpyi Created 7 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/loader/ImageLoader.cpp ('k') | Source/core/loader/NavigationAction.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 16 matching lines...) Expand all
27 */ 27 */
28 28
29 #include "config.h" 29 #include "config.h"
30 #include "core/loader/MixedContentChecker.h" 30 #include "core/loader/MixedContentChecker.h"
31 31
32 #include "core/dom/Document.h" 32 #include "core/dom/Document.h"
33 #include "core/loader/FrameLoader.h" 33 #include "core/loader/FrameLoader.h"
34 #include "core/loader/FrameLoaderClient.h" 34 #include "core/loader/FrameLoaderClient.h"
35 #include "core/frame/Frame.h" 35 #include "core/frame/Frame.h"
36 #include "core/page/Settings.h" 36 #include "core/page/Settings.h"
37 #include "weborigin/SecurityOrigin.h" 37 #include "platform/weborigin/SecurityOrigin.h"
38 #include "wtf/text/WTFString.h" 38 #include "wtf/text/WTFString.h"
39 39
40 namespace WebCore { 40 namespace WebCore {
41 41
42 MixedContentChecker::MixedContentChecker(Frame* frame) 42 MixedContentChecker::MixedContentChecker(Frame* frame)
43 : m_frame(frame) 43 : m_frame(frame)
44 { 44 {
45 } 45 }
46 46
47 FrameLoaderClient* MixedContentChecker::client() const 47 FrameLoaderClient* MixedContentChecker::client() const
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 } 90 }
91 91
92 void MixedContentChecker::logWarning(bool allowed, const String& action, const K URL& target) const 92 void MixedContentChecker::logWarning(bool allowed, const String& action, const K URL& target) const
93 { 93 {
94 String message = String(allowed ? "" : "[blocked] ") + "The page at '" + m_f rame->document()->url().elidedString() + "' was loaded over HTTPS, but " + actio n + " insecure content from '" + target.elidedString() + "': this content should also be loaded over HTTPS.\n"; 94 String message = String(allowed ? "" : "[blocked] ") + "The page at '" + m_f rame->document()->url().elidedString() + "' was loaded over HTTPS, but " + actio n + " insecure content from '" + target.elidedString() + "': this content should also be loaded over HTTPS.\n";
95 MessageLevel messageLevel = allowed ? WarningMessageLevel : ErrorMessageLeve l; 95 MessageLevel messageLevel = allowed ? WarningMessageLevel : ErrorMessageLeve l;
96 m_frame->document()->addConsoleMessage(SecurityMessageSource, messageLevel, message); 96 m_frame->document()->addConsoleMessage(SecurityMessageSource, messageLevel, message);
97 } 97 }
98 98
99 } // namespace WebCore 99 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/loader/ImageLoader.cpp ('k') | Source/core/loader/NavigationAction.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698