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

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

Issue 7575035: Revert 95541 - Profiles: SSLManger broadcasts SSL_INTERNAL_STATE_CHANGED with a Source<BrowserCon... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 // |ContinueDespiteLastError| on the net::URLRequest. 45 // |ContinueDespiteLastError| on the net::URLRequest.
46 // 46 //
47 // Called on the IO thread. 47 // Called on the IO thread.
48 static void OnSSLCertificateError(ResourceDispatcherHost* resource_dispatcher, 48 static void OnSSLCertificateError(ResourceDispatcherHost* resource_dispatcher,
49 net::URLRequest* request, 49 net::URLRequest* request,
50 int cert_error, 50 int cert_error,
51 net::X509Certificate* cert); 51 net::X509Certificate* cert);
52 52
53 // Called when SSL state for a host or tab changes. Broadcasts the 53 // Called when SSL state for a host or tab changes. Broadcasts the
54 // SSL_INTERNAL_STATE_CHANGED notification. 54 // SSL_INTERNAL_STATE_CHANGED notification.
55 static void NotifySSLInternalStateChanged(NavigationController* controller); 55 static void NotifySSLInternalStateChanged();
56 56
57 // Convenience methods for serializing/deserializing the security info. 57 // Convenience methods for serializing/deserializing the security info.
58 static std::string SerializeSecurityInfo(int cert_id, 58 static std::string SerializeSecurityInfo(int cert_id,
59 int cert_status, 59 int cert_status,
60 int security_bits, 60 int security_bits,
61 int connection_status); 61 int connection_status);
62 static bool DeserializeSecurityInfo(const std::string& state, 62 static bool DeserializeSecurityInfo(const std::string& state,
63 int* cert_id, 63 int* cert_id,
64 int* cert_status, 64 int* cert_status,
65 int* security_bits, 65 int* security_bits,
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 // for the security UI of this tab. 119 // for the security UI of this tab.
120 NavigationController* controller_; 120 NavigationController* controller_;
121 121
122 // Handles registering notifications with the NotificationService. 122 // Handles registering notifications with the NotificationService.
123 NotificationRegistrar registrar_; 123 NotificationRegistrar registrar_;
124 124
125 DISALLOW_COPY_AND_ASSIGN(SSLManager); 125 DISALLOW_COPY_AND_ASSIGN(SSLManager);
126 }; 126 };
127 127
128 #endif // CONTENT_BROWSER_SSL_SSL_MANAGER_H_ 128 #endif // CONTENT_BROWSER_SSL_SSL_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/ssl/ssl_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698