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 654 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
665 ChosenObjectInfoList chosen_object_info_list; | 665 ChosenObjectInfoList chosen_object_info_list; |
666 | 666 |
667 WebsiteSettingsUI::PermissionInfo permission_info; | 667 WebsiteSettingsUI::PermissionInfo permission_info; |
668 for (size_t i = 0; i < arraysize(kPermissionType); ++i) { | 668 for (size_t i = 0; i < arraysize(kPermissionType); ++i) { |
669 permission_info.type = kPermissionType[i]; | 669 permission_info.type = kPermissionType[i]; |
670 | 670 |
671 if (!ShouldShowPermission(permission_info.type)) | 671 if (!ShouldShowPermission(permission_info.type)) |
672 continue; | 672 continue; |
673 | 673 |
674 content_settings::SettingInfo info; | 674 content_settings::SettingInfo info; |
675 scoped_ptr<base::Value> value = | 675 std::unique_ptr<base::Value> value = content_settings_->GetWebsiteSetting( |
676 content_settings_->GetWebsiteSetting( | 676 site_url_, site_url_, permission_info.type, std::string(), &info); |
677 site_url_, site_url_, permission_info.type, std::string(), &info); | |
678 DCHECK(value.get()); | 677 DCHECK(value.get()); |
679 if (value->GetType() == base::Value::TYPE_INTEGER) { | 678 if (value->GetType() == base::Value::TYPE_INTEGER) { |
680 permission_info.setting = | 679 permission_info.setting = |
681 content_settings::ValueToContentSetting(value.get()); | 680 content_settings::ValueToContentSetting(value.get()); |
682 } else { | 681 } else { |
683 NOTREACHED(); | 682 NOTREACHED(); |
684 } | 683 } |
685 | 684 |
686 permission_info.source = info.source; | 685 permission_info.source = info.source; |
687 permission_info.is_incognito = profile_->IsOffTheRecord(); | 686 permission_info.is_incognito = profile_->IsOffTheRecord(); |
(...skipping 15 matching lines...) Expand all Loading... |
703 permission_info.type)) { | 702 permission_info.type)) { |
704 continue; | 703 continue; |
705 } | 704 } |
706 permission_info_list.push_back(permission_info); | 705 permission_info_list.push_back(permission_info); |
707 } | 706 } |
708 | 707 |
709 for (const ChooserUIInfo& ui_info : kChooserUIInfo) { | 708 for (const ChooserUIInfo& ui_info : kChooserUIInfo) { |
710 ChooserContextBase* context = ui_info.get_context(profile_); | 709 ChooserContextBase* context = ui_info.get_context(profile_); |
711 const GURL origin = site_url_.GetOrigin(); | 710 const GURL origin = site_url_.GetOrigin(); |
712 auto chosen_objects = context->GetGrantedObjects(origin, origin); | 711 auto chosen_objects = context->GetGrantedObjects(origin, origin); |
713 for (scoped_ptr<base::DictionaryValue>& object : chosen_objects) { | 712 for (std::unique_ptr<base::DictionaryValue>& object : chosen_objects) { |
714 chosen_object_info_list.push_back( | 713 chosen_object_info_list.push_back( |
715 new WebsiteSettingsUI::ChosenObjectInfo(ui_info, std::move(object))); | 714 new WebsiteSettingsUI::ChosenObjectInfo(ui_info, std::move(object))); |
716 } | 715 } |
717 } | 716 } |
718 | 717 |
719 ui_->SetPermissionInfo(permission_info_list, chosen_object_info_list); | 718 ui_->SetPermissionInfo(permission_info_list, chosen_object_info_list); |
720 } | 719 } |
721 | 720 |
722 void WebsiteSettings::PresentSiteData() { | 721 void WebsiteSettings::PresentSiteData() { |
723 CookieInfoList cookie_info_list; | 722 CookieInfoList cookie_info_list; |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
760 info.connection_status = site_connection_status_; | 759 info.connection_status = site_connection_status_; |
761 info.connection_status_description = | 760 info.connection_status_description = |
762 UTF16ToUTF8(site_connection_details_); | 761 UTF16ToUTF8(site_connection_details_); |
763 info.identity_status = site_identity_status_; | 762 info.identity_status = site_identity_status_; |
764 info.identity_status_description = | 763 info.identity_status_description = |
765 UTF16ToUTF8(site_identity_details_); | 764 UTF16ToUTF8(site_identity_details_); |
766 info.cert_id = cert_id_; | 765 info.cert_id = cert_id_; |
767 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; | 766 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; |
768 ui_->SetIdentityInfo(info); | 767 ui_->SetIdentityInfo(info); |
769 } | 768 } |
OLD | NEW |