| 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 658 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 669             site_url_, site_url_, permission_info.type, std::string(), &info); | 669             site_url_, site_url_, permission_info.type, std::string(), &info); | 
| 670     DCHECK(value.get()); | 670     DCHECK(value.get()); | 
| 671     if (value->GetType() == base::Value::TYPE_INTEGER) { | 671     if (value->GetType() == base::Value::TYPE_INTEGER) { | 
| 672       permission_info.setting = | 672       permission_info.setting = | 
| 673           content_settings::ValueToContentSetting(value.get()); | 673           content_settings::ValueToContentSetting(value.get()); | 
| 674     } else { | 674     } else { | 
| 675       NOTREACHED(); | 675       NOTREACHED(); | 
| 676     } | 676     } | 
| 677 | 677 | 
| 678     permission_info.source = info.source; | 678     permission_info.source = info.source; | 
|  | 679     permission_info.is_incognito = profile_->IsOffTheRecord(); | 
| 679 | 680 | 
| 680     if (info.primary_pattern == ContentSettingsPattern::Wildcard() && | 681     if (info.primary_pattern == ContentSettingsPattern::Wildcard() && | 
| 681         info.secondary_pattern == ContentSettingsPattern::Wildcard()) { | 682         info.secondary_pattern == ContentSettingsPattern::Wildcard()) { | 
| 682       permission_info.default_setting = permission_info.setting; | 683       permission_info.default_setting = permission_info.setting; | 
| 683       permission_info.setting = CONTENT_SETTING_DEFAULT; | 684       permission_info.setting = CONTENT_SETTING_DEFAULT; | 
| 684     } else { | 685     } else { | 
| 685       permission_info.default_setting = | 686       permission_info.default_setting = | 
| 686           content_settings_->GetDefaultContentSetting(permission_info.type, | 687           content_settings_->GetDefaultContentSetting(permission_info.type, | 
| 687                                                       NULL); | 688                                                       NULL); | 
| 688     } | 689     } | 
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 746   info.connection_status = site_connection_status_; | 747   info.connection_status = site_connection_status_; | 
| 747   info.connection_status_description = | 748   info.connection_status_description = | 
| 748       UTF16ToUTF8(site_connection_details_); | 749       UTF16ToUTF8(site_connection_details_); | 
| 749   info.identity_status = site_identity_status_; | 750   info.identity_status = site_identity_status_; | 
| 750   info.identity_status_description = | 751   info.identity_status_description = | 
| 751       UTF16ToUTF8(site_identity_details_); | 752       UTF16ToUTF8(site_identity_details_); | 
| 752   info.cert_id = cert_id_; | 753   info.cert_id = cert_id_; | 
| 753   info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; | 754   info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; | 
| 754   ui_->SetIdentityInfo(info); | 755   ui_->SetIdentityInfo(info); | 
| 755 } | 756 } | 
| OLD | NEW | 
|---|