| Index: chrome/browser/ssl/ssl_error_handler.cc
|
| diff --git a/chrome/browser/ssl/ssl_error_handler.cc b/chrome/browser/ssl/ssl_error_handler.cc
|
| index de91bccc4a633a05d462f1fa82afdce2495bd7af..b0b42914bdf560d67102b4dfd1229114f7761938 100644
|
| --- a/chrome/browser/ssl/ssl_error_handler.cc
|
| +++ b/chrome/browser/ssl/ssl_error_handler.cc
|
| @@ -25,6 +25,7 @@
|
| #include "components/network_time/network_time_tracker.h"
|
| #include "components/ssl_errors/error_classification.h"
|
| #include "components/ssl_errors/error_info.h"
|
| +#include "content/public/browser/navigation_handle.h"
|
| #include "content/public/browser/notification_service.h"
|
| #include "content/public/browser/notification_source.h"
|
| #include "content/public/browser/render_frame_host.h"
|
| @@ -468,9 +469,11 @@ void SSLErrorHandler::Observe(
|
| #endif
|
| }
|
|
|
| -void SSLErrorHandler::DidStartNavigationToPendingEntry(
|
| - const GURL& /* url */,
|
| - content::ReloadType /* reload_type */) {
|
| +void SSLErrorHandler::DidStartNavigation(
|
| + content::NavigationHandle* navigation_handle) {
|
| + if (!navigation_handle->IsInMainFrame() || navigation_handle->IsSamePage())
|
| + return;
|
| +
|
| // Destroy the error handler on all new navigations. This ensures that the
|
| // handler is properly recreated when a hanging page is navigated to an SSL
|
| // error, even when the tab's WebContents doesn't change.
|
|
|