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

Side by Side Diff: content/browser/ssl/ssl_manager.h

Issue 1259253009: Revert of Attach a SecurityStyle to each request in ResourceLoader (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
« no previous file with comments | « content/browser/loader/resource_loader_unittest.cc ('k') | content/browser/ssl/ssl_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_SSL_SSL_MANAGER_H_ 5 #ifndef CONTENT_BROWSER_SSL_SSL_MANAGER_H_
6 #define CONTENT_BROWSER_SSL_SSL_MANAGER_H_ 6 #define CONTENT_BROWSER_SSL_SSL_MANAGER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 void DidCommitProvisionalLoad(const LoadCommittedDetails& details); 75 void DidCommitProvisionalLoad(const LoadCommittedDetails& details);
76 void DidLoadFromMemoryCache(const LoadFromMemoryCacheDetails& details); 76 void DidLoadFromMemoryCache(const LoadFromMemoryCacheDetails& details);
77 void DidStartResourceResponse(const ResourceRequestDetails& details); 77 void DidStartResourceResponse(const ResourceRequestDetails& details);
78 void DidReceiveResourceRedirect(const ResourceRedirectDetails& details); 78 void DidReceiveResourceRedirect(const ResourceRedirectDetails& details);
79 79
80 // Insecure content entry point. 80 // Insecure content entry point.
81 void DidDisplayInsecureContent(); 81 void DidDisplayInsecureContent();
82 void DidRunInsecureContent(const std::string& security_origin); 82 void DidRunInsecureContent(const std::string& security_origin);
83 83
84 private: 84 private:
85 // Updates the NavigationEntry with our current state. This will 85 // Update the NavigationEntry with our current state.
86 // notify the WebContents of an SSL state change if a change was
87 // actually made.
88 void UpdateEntry(NavigationEntryImpl* entry); 86 void UpdateEntry(NavigationEntryImpl* entry);
89 87
90 // Notifies the WebContents that the SSL state changed.
91 void NotifyDidChangeVisibleSSLState();
92
93 // The backend for the SSLPolicy to actuate its decisions. 88 // The backend for the SSLPolicy to actuate its decisions.
94 SSLPolicyBackend backend_; 89 SSLPolicyBackend backend_;
95 90
96 // The SSLPolicy instance for this manager. 91 // The SSLPolicy instance for this manager.
97 scoped_ptr<SSLPolicy> policy_; 92 scoped_ptr<SSLPolicy> policy_;
98 93
99 // The NavigationController that owns this SSLManager. We are responsible 94 // The NavigationController that owns this SSLManager. We are responsible
100 // for the security UI of this tab. 95 // for the security UI of this tab.
101 NavigationControllerImpl* controller_; 96 NavigationControllerImpl* controller_;
102 97
103 DISALLOW_COPY_AND_ASSIGN(SSLManager); 98 DISALLOW_COPY_AND_ASSIGN(SSLManager);
104 }; 99 };
105 100
106 } // namespace content 101 } // namespace content
107 102
108 #endif // CONTENT_BROWSER_SSL_SSL_MANAGER_H_ 103 #endif // CONTENT_BROWSER_SSL_SSL_MANAGER_H_
OLDNEW
« no previous file with comments | « content/browser/loader/resource_loader_unittest.cc ('k') | content/browser/ssl/ssl_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698