OLD | NEW |
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 #include "chrome/browser/ui/website_settings/website_settings.h" | 5 #include "chrome/browser/ui/website_settings/website_settings.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
88 CONTENT_SETTINGS_TYPE_JAVASCRIPT, | 88 CONTENT_SETTINGS_TYPE_JAVASCRIPT, |
89 CONTENT_SETTINGS_TYPE_POPUPS, | 89 CONTENT_SETTINGS_TYPE_POPUPS, |
90 CONTENT_SETTINGS_TYPE_FULLSCREEN, | 90 CONTENT_SETTINGS_TYPE_FULLSCREEN, |
91 CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, | 91 CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, |
92 CONTENT_SETTINGS_TYPE_PLUGINS, | 92 CONTENT_SETTINGS_TYPE_PLUGINS, |
93 CONTENT_SETTINGS_TYPE_MOUSELOCK, | 93 CONTENT_SETTINGS_TYPE_MOUSELOCK, |
94 CONTENT_SETTINGS_TYPE_MIDI_SYSEX, | 94 CONTENT_SETTINGS_TYPE_MIDI_SYSEX, |
95 #if defined(OS_ANDROID) | 95 #if defined(OS_ANDROID) |
96 CONTENT_SETTINGS_TYPE_PUSH_MESSAGING, | 96 CONTENT_SETTINGS_TYPE_PUSH_MESSAGING, |
97 #endif | 97 #endif |
| 98 CONTENT_SETTINGS_TYPE_KEYGEN, |
98 }; | 99 }; |
99 | 100 |
100 // Returns true if any of the given statuses match |status|. | 101 // Returns true if any of the given statuses match |status|. |
101 bool CertificateTransparencyStatusMatchAny( | 102 bool CertificateTransparencyStatusMatchAny( |
102 const std::vector<net::ct::SCTVerifyStatus>& sct_verify_statuses, | 103 const std::vector<net::ct::SCTVerifyStatus>& sct_verify_statuses, |
103 net::ct::SCTVerifyStatus status) { | 104 net::ct::SCTVerifyStatus status) { |
104 for (const auto& verify_status : sct_verify_statuses) { | 105 for (const auto& verify_status : sct_verify_statuses) { |
105 if (verify_status == status) | 106 if (verify_status == status) |
106 return true; | 107 return true; |
107 } | 108 } |
(...skipping 591 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
699 info.connection_status = site_connection_status_; | 700 info.connection_status = site_connection_status_; |
700 info.connection_status_description = | 701 info.connection_status_description = |
701 UTF16ToUTF8(site_connection_details_); | 702 UTF16ToUTF8(site_connection_details_); |
702 info.identity_status = site_identity_status_; | 703 info.identity_status = site_identity_status_; |
703 info.identity_status_description = | 704 info.identity_status_description = |
704 UTF16ToUTF8(site_identity_details_); | 705 UTF16ToUTF8(site_identity_details_); |
705 info.cert_id = cert_id_; | 706 info.cert_id = cert_id_; |
706 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; | 707 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; |
707 ui_->SetIdentityInfo(info); | 708 ui_->SetIdentityInfo(info); |
708 } | 709 } |
OLD | NEW |