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 <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <string> | 10 #include <string> |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 CONTENT_SETTINGS_TYPE_JAVASCRIPT, | 94 CONTENT_SETTINGS_TYPE_JAVASCRIPT, |
95 CONTENT_SETTINGS_TYPE_POPUPS, | 95 CONTENT_SETTINGS_TYPE_POPUPS, |
96 CONTENT_SETTINGS_TYPE_FULLSCREEN, | 96 CONTENT_SETTINGS_TYPE_FULLSCREEN, |
97 CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, | 97 CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, |
98 CONTENT_SETTINGS_TYPE_PLUGINS, | 98 CONTENT_SETTINGS_TYPE_PLUGINS, |
99 CONTENT_SETTINGS_TYPE_MOUSELOCK, | 99 CONTENT_SETTINGS_TYPE_MOUSELOCK, |
100 CONTENT_SETTINGS_TYPE_MIDI_SYSEX, | 100 CONTENT_SETTINGS_TYPE_MIDI_SYSEX, |
101 #if defined(OS_ANDROID) | 101 #if defined(OS_ANDROID) |
102 CONTENT_SETTINGS_TYPE_PUSH_MESSAGING, | 102 CONTENT_SETTINGS_TYPE_PUSH_MESSAGING, |
103 #endif | 103 #endif |
| 104 CONTENT_SETTINGS_TYPE_KEYGEN, |
104 }; | 105 }; |
105 | 106 |
106 // Returns true if any of the given statuses match |status|. | 107 // Returns true if any of the given statuses match |status|. |
107 bool CertificateTransparencyStatusMatchAny( | 108 bool CertificateTransparencyStatusMatchAny( |
108 const std::vector<net::ct::SCTVerifyStatus>& sct_verify_statuses, | 109 const std::vector<net::ct::SCTVerifyStatus>& sct_verify_statuses, |
109 net::ct::SCTVerifyStatus status) { | 110 net::ct::SCTVerifyStatus status) { |
110 for (const auto& verify_status : sct_verify_statuses) { | 111 for (const auto& verify_status : sct_verify_statuses) { |
111 if (verify_status == status) | 112 if (verify_status == status) |
112 return true; | 113 return true; |
113 } | 114 } |
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
648 if (info.primary_pattern == ContentSettingsPattern::Wildcard() && | 649 if (info.primary_pattern == ContentSettingsPattern::Wildcard() && |
649 info.secondary_pattern == ContentSettingsPattern::Wildcard()) { | 650 info.secondary_pattern == ContentSettingsPattern::Wildcard()) { |
650 permission_info.default_setting = permission_info.setting; | 651 permission_info.default_setting = permission_info.setting; |
651 permission_info.setting = CONTENT_SETTING_DEFAULT; | 652 permission_info.setting = CONTENT_SETTING_DEFAULT; |
652 } else { | 653 } else { |
653 permission_info.default_setting = | 654 permission_info.default_setting = |
654 content_settings_->GetDefaultContentSetting(permission_info.type, | 655 content_settings_->GetDefaultContentSetting(permission_info.type, |
655 NULL); | 656 NULL); |
656 } | 657 } |
657 | 658 |
658 if (permission_info.setting != CONTENT_SETTING_DEFAULT && | 659 if ((permission_info.setting != CONTENT_SETTING_DEFAULT && |
659 permission_info.setting != permission_info.default_setting) { | 660 permission_info.setting != permission_info.default_setting) || |
| 661 (permission_info.type == CONTENT_SETTINGS_TYPE_KEYGEN && |
| 662 tab_specific_content_settings()->IsContentBlocked( |
| 663 permission_info.type))) { |
660 permission_info_list.push_back(permission_info); | 664 permission_info_list.push_back(permission_info); |
661 } | 665 } |
662 } | 666 } |
663 | 667 |
664 ui_->SetPermissionInfo(permission_info_list); | 668 ui_->SetPermissionInfo(permission_info_list); |
665 } | 669 } |
666 | 670 |
667 void WebsiteSettings::PresentSiteData() { | 671 void WebsiteSettings::PresentSiteData() { |
668 CookieInfoList cookie_info_list; | 672 CookieInfoList cookie_info_list; |
669 const LocalSharedObjectsCounter& allowed_objects = | 673 const LocalSharedObjectsCounter& allowed_objects = |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
705 info.connection_status = site_connection_status_; | 709 info.connection_status = site_connection_status_; |
706 info.connection_status_description = | 710 info.connection_status_description = |
707 UTF16ToUTF8(site_connection_details_); | 711 UTF16ToUTF8(site_connection_details_); |
708 info.identity_status = site_identity_status_; | 712 info.identity_status = site_identity_status_; |
709 info.identity_status_description = | 713 info.identity_status_description = |
710 UTF16ToUTF8(site_identity_details_); | 714 UTF16ToUTF8(site_identity_details_); |
711 info.cert_id = cert_id_; | 715 info.cert_id = cert_id_; |
712 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; | 716 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; |
713 ui_->SetIdentityInfo(info); | 717 ui_->SetIdentityInfo(info); |
714 } | 718 } |
OLD | NEW |