| 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 689 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 700 | 700 |
| 701 if (certificate_ && identityInfo.show_ssl_decision_revoke_button) { | 701 if (certificate_ && identityInfo.show_ssl_decision_revoke_button) { |
| 702 resetDecisionsField_ = | 702 resetDecisionsField_ = |
| 703 [self addText:base::string16() | 703 [self addText:base::string16() |
| 704 withSize:[NSFont smallSystemFontSize] | 704 withSize:[NSFont smallSystemFontSize] |
| 705 bold:NO | 705 bold:NO |
| 706 toView:securitySectionView_ | 706 toView:securitySectionView_ |
| 707 atPoint:NSMakePoint(kSectionHorizontalPadding, 0)]; | 707 atPoint:NSMakePoint(kSectionHorizontalPadding, 0)]; |
| 708 [resetDecisionsField_ | 708 [resetDecisionsField_ |
| 709 setStringValue:l10n_util::GetNSString( | 709 setStringValue:l10n_util::GetNSString( |
| 710 IDS_PAGEINFO_INVALID_CERTIFICATE_DESCRIPTION)]; | 710 IDS_PAGE_INFO_INVALID_CERTIFICATE_DESCRIPTION)]; |
| 711 [self sizeTextFieldHeightToFit:resetDecisionsField_]; | 711 [self sizeTextFieldHeightToFit:resetDecisionsField_]; |
| 712 | 712 |
| 713 resetDecisionsButton_ = | 713 resetDecisionsButton_ = |
| 714 [self addLinkButtonWithText: | 714 [self addLinkButtonWithText: |
| 715 l10n_util::GetNSString( | 715 l10n_util::GetNSString( |
| 716 IDS_PAGEINFO_RESET_INVALID_CERTIFICATE_DECISIONS_BUTTON) | 716 IDS_PAGE_INFO_RESET_INVALID_CERTIFICATE_DECISIONS_BUTTON) |
| 717 toView:securitySectionView_]; | 717 toView:securitySectionView_]; |
| 718 [resetDecisionsButton_ setTarget:self]; | 718 [resetDecisionsButton_ setTarget:self]; |
| 719 [resetDecisionsButton_ setAction:@selector(resetCertificateDecisions:)]; | 719 [resetDecisionsButton_ setAction:@selector(resetCertificateDecisions:)]; |
| 720 } | 720 } |
| 721 | 721 |
| 722 [self performLayout]; | 722 [self performLayout]; |
| 723 } | 723 } |
| 724 | 724 |
| 725 // Add a pop-up button for |permissionInfo| to the given view. | 725 // Add a pop-up button for |permissionInfo| to the given view. |
| 726 - (NSPopUpButton*)addPopUpButtonForPermission: | 726 - (NSPopUpButton*)addPopUpButtonForPermission: |
| (...skipping 492 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1219 void PageInfoUIBridge::SetCookieInfo(const CookieInfoList& cookie_info_list) { | 1219 void PageInfoUIBridge::SetCookieInfo(const CookieInfoList& cookie_info_list) { |
| 1220 [bubble_controller_ setCookieInfo:cookie_info_list]; | 1220 [bubble_controller_ setCookieInfo:cookie_info_list]; |
| 1221 } | 1221 } |
| 1222 | 1222 |
| 1223 void PageInfoUIBridge::SetPermissionInfo( | 1223 void PageInfoUIBridge::SetPermissionInfo( |
| 1224 const PermissionInfoList& permission_info_list, | 1224 const PermissionInfoList& permission_info_list, |
| 1225 ChosenObjectInfoList chosen_object_info_list) { | 1225 ChosenObjectInfoList chosen_object_info_list) { |
| 1226 [bubble_controller_ setPermissionInfo:permission_info_list | 1226 [bubble_controller_ setPermissionInfo:permission_info_list |
| 1227 andChosenObjects:std::move(chosen_object_info_list)]; | 1227 andChosenObjects:std::move(chosen_object_info_list)]; |
| 1228 } | 1228 } |
| OLD | NEW |