| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 #include "chrome/browser/ssl/ssl_manager.h" | 5 #include "chrome/browser/ssl/ssl_manager.h" |
| 6 | 6 |
| 7 #include "base/message_loop.h" | 7 #include "base/message_loop.h" |
| 8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
| 9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
| 10 #include "chrome/browser/load_from_memory_cache_details.h" | 10 #include "chrome/browser/load_from_memory_cache_details.h" |
| (...skipping 615 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 626 !details->entry->ssl().has_mixed_content()) { | 626 !details->entry->ssl().has_mixed_content()) { |
| 627 details->entry->ssl().set_has_mixed_content(); | 627 details->entry->ssl().set_has_mixed_content(); |
| 628 changed = true; | 628 changed = true; |
| 629 } | 629 } |
| 630 } | 630 } |
| 631 } | 631 } |
| 632 | 632 |
| 633 if (changed) { | 633 if (changed) { |
| 634 // Only send the notification when something actually changed. | 634 // Only send the notification when something actually changed. |
| 635 NotificationService::current()->Notify( | 635 NotificationService::current()->Notify( |
| 636 NotificationType::SSL_STATE_CHANGED, | 636 NotificationType::SSL_VISIBLE_STATE_CHANGED, |
| 637 Source<NavigationController>(controller_), | 637 Source<NavigationController>(controller_), |
| 638 NotificationService::NoDetails()); | 638 NotificationService::NoDetails()); |
| 639 } | 639 } |
| 640 } | 640 } |
| 641 | 641 |
| 642 void SSLManager::DidFailProvisionalLoadWithError( | 642 void SSLManager::DidFailProvisionalLoadWithError( |
| 643 ProvisionalLoadDetails* details) { | 643 ProvisionalLoadDetails* details) { |
| 644 DCHECK(details); | 644 DCHECK(details); |
| 645 | 645 |
| 646 // Ignore in-page navigations. | 646 // Ignore in-page navigations. |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 735 } | 735 } |
| 736 | 736 |
| 737 if (ca_name) { | 737 if (ca_name) { |
| 738 // TODO(wtc): should we show the root CA's name instead? | 738 // TODO(wtc): should we show the root CA's name instead? |
| 739 *ca_name = l10n_util::GetStringF( | 739 *ca_name = l10n_util::GetStringF( |
| 740 IDS_SECURE_CONNECTION_EV_CA, | 740 IDS_SECURE_CONNECTION_EV_CA, |
| 741 UTF8ToWide(cert.issuer().organization_names[0])); | 741 UTF8ToWide(cert.issuer().organization_names[0])); |
| 742 } | 742 } |
| 743 return true; | 743 return true; |
| 744 } | 744 } |
| OLD | NEW |