Index: content/browser/ssl/ssl_manager.h |
diff --git a/content/browser/ssl/ssl_manager.h b/content/browser/ssl/ssl_manager.h |
index 70cd067e1214de8aa679f32683eaea78f7b6645e..f4f89a2bfbd134f8da687abdadadbfaa264accf7 100644 |
--- a/content/browser/ssl/ssl_manager.h |
+++ b/content/browser/ssl/ssl_manager.h |
@@ -1,4 +1,4 @@ |
-// Copyright (c) 2011 The Chromium Authors. All rights reserved. |
+// Copyright (c) 2012 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
@@ -11,7 +11,9 @@ |
#include "base/basictypes.h" |
#include "base/memory/scoped_ptr.h" |
#include "content/browser/ssl/ssl_policy_backend.h" |
+#include "content/browser/ssl/ssl_error_handler.h" |
#include "content/common/content_export.h" |
+#include "content/public/browser/global_request_id.h" |
#include "content/public/browser/notification_observer.h" |
#include "content/public/browser/notification_registrar.h" |
#include "googleurl/src/gurl.h" |
@@ -20,7 +22,6 @@ |
class LoadFromMemoryCacheDetails; |
class NavigationControllerImpl; |
-class ResourceDispatcherHost; |
class ResourceRedirectDetails; |
class ResourceRequestDetails; |
class SSLPolicy; |
@@ -31,7 +32,6 @@ class NavigationEntryImpl; |
namespace net { |
class SSLInfo; |
-class URLRequest; |
} // namespace net |
// The SSLManager SSLManager controls the SSL UI elements in a TabContents. It |
@@ -47,11 +47,11 @@ class SSLManager : public content::NotificationObserver { |
// Entry point for SSLCertificateErrors. This function begins the process |
// of resolving a certificate error during an SSL connection. SSLManager |
// will adjust the security UI and either call |Cancel| or |
- // |ContinueDespiteLastError| on the net::URLRequest. |
+ // |ContinueDespiteLastError| on the request associated with |id|. |
wtc
2012/02/24 00:44:38
The references to |Cancel| and |ContinueDespiteLas
Takashi Toyoshima
2012/02/28 20:55:43
Done.
|
// |
// Called on the IO thread. |
- static void OnSSLCertificateError(ResourceDispatcherHost* resource_dispatcher, |
- net::URLRequest* request, |
+ static void OnSSLCertificateError(SSLErrorHandler::Delegate* delegate, |
+ const content::GlobalRequestID& id, |
const net::SSLInfo& ssl_info, |
bool fatal); |