| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #import "chrome/browser/ui/cocoa/page_info/page_info_bubble_controller.h" | 5 #import "chrome/browser/ui/cocoa/page_info/page_info_bubble_controller.h" |
| 6 | 6 |
| 7 #import <AppKit/AppKit.h> | 7 #import <AppKit/AppKit.h> |
| 8 | 8 |
| 9 #include <cmath> | 9 #include <cmath> |
| 10 | 10 |
| (...skipping 837 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 848 if (certificate_) { | 848 if (certificate_) { |
| 849 if (identityInfo.show_ssl_decision_revoke_button) { | 849 if (identityInfo.show_ssl_decision_revoke_button) { |
| 850 resetDecisionsField_ = | 850 resetDecisionsField_ = |
| 851 [self addText:base::string16() | 851 [self addText:base::string16() |
| 852 withSize:[NSFont smallSystemFontSize] | 852 withSize:[NSFont smallSystemFontSize] |
| 853 bold:NO | 853 bold:NO |
| 854 toView:securitySectionView_ | 854 toView:securitySectionView_ |
| 855 atPoint:NSMakePoint(kSectionHorizontalPadding, 0)]; | 855 atPoint:NSMakePoint(kSectionHorizontalPadding, 0)]; |
| 856 [resetDecisionsField_ | 856 [resetDecisionsField_ |
| 857 setStringValue:l10n_util::GetNSString( | 857 setStringValue:l10n_util::GetNSString( |
| 858 IDS_PAGEINFO_INVALID_CERTIFICATE_DESCRIPTION)]; | 858 IDS_PAGE_INFO_INVALID_CERTIFICATE_DESCRIPTION)]; |
| 859 [self sizeTextFieldHeightToFit:resetDecisionsField_]; | 859 [self sizeTextFieldHeightToFit:resetDecisionsField_]; |
| 860 | 860 |
| 861 resetDecisionsButton_ = | 861 resetDecisionsButton_ = [self |
| 862 [self addLinkButtonWithText: | 862 addLinkButtonWithText: |
| 863 l10n_util::GetNSString( | 863 l10n_util::GetNSString( |
| 864 IDS_PAGEINFO_RESET_INVALID_CERTIFICATE_DECISIONS_BUTTON) | 864 IDS_PAGE_INFO_RESET_INVALID_CERTIFICATE_DECISIONS_BUTTON) |
| 865 toView:securitySectionView_]; | 865 toView:securitySectionView_]; |
| 866 [resetDecisionsButton_ setTarget:self]; | 866 [resetDecisionsButton_ setTarget:self]; |
| 867 [resetDecisionsButton_ setAction:@selector(resetCertificateDecisions:)]; | 867 [resetDecisionsButton_ setAction:@selector(resetCertificateDecisions:)]; |
| 868 } | 868 } |
| 869 | 869 |
| 870 if (PageInfoUI::ShouldShowCertificateLink()) { | 870 if (PageInfoUI::ShouldShowCertificateLink()) { |
| 871 bool isValid = (identityInfo.identity_status != | 871 bool isValid = (identityInfo.identity_status != |
| 872 PageInfo::SITE_IDENTITY_STATUS_ERROR); | 872 PageInfo::SITE_IDENTITY_STATUS_ERROR); |
| 873 NSString* linkText = l10n_util::GetNSString( | 873 NSString* linkText = l10n_util::GetNSString( |
| 874 isValid ? IDS_PAGE_INFO_CERTIFICATE_VALID_LINK | 874 isValid ? IDS_PAGE_INFO_CERTIFICATE_VALID_LINK |
| 875 : IDS_PAGE_INFO_CERTIFICATE_INVALID_LINK); | 875 : IDS_PAGE_INFO_CERTIFICATE_INVALID_LINK); |
| (...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1324 void PageInfoUIBridge::SetCookieInfo(const CookieInfoList& cookie_info_list) { | 1324 void PageInfoUIBridge::SetCookieInfo(const CookieInfoList& cookie_info_list) { |
| 1325 [bubble_controller_ setCookieInfo:cookie_info_list]; | 1325 [bubble_controller_ setCookieInfo:cookie_info_list]; |
| 1326 } | 1326 } |
| 1327 | 1327 |
| 1328 void PageInfoUIBridge::SetPermissionInfo( | 1328 void PageInfoUIBridge::SetPermissionInfo( |
| 1329 const PermissionInfoList& permission_info_list, | 1329 const PermissionInfoList& permission_info_list, |
| 1330 ChosenObjectInfoList chosen_object_info_list) { | 1330 ChosenObjectInfoList chosen_object_info_list) { |
| 1331 [bubble_controller_ setPermissionInfo:permission_info_list | 1331 [bubble_controller_ setPermissionInfo:permission_info_list |
| 1332 andChosenObjects:std::move(chosen_object_info_list)]; | 1332 andChosenObjects:std::move(chosen_object_info_list)]; |
| 1333 } | 1333 } |
| OLD | NEW |