Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(115)

Side by Side Diff: chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm

Issue 1813623002: Prevent the "Stop using an invalid certificate" button from showing up on about:blank for OSX. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update test. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller_unittest.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/website_settings/website_settings_bubble_contro ller.h" 5 #import "chrome/browser/ui/cocoa/website_settings/website_settings_bubble_contro ller.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 8
9 #import <AppKit/AppKit.h> 9 #import <AppKit/AppKit.h>
10 10
(...skipping 631 matching lines...) Expand 10 before | Expand all | Expand 10 after
642 642
643 // Set the content of the identity and identity status fields. 643 // Set the content of the identity and identity status fields.
644 - (void)setIdentityInfo:(const WebsiteSettingsUI::IdentityInfo&)identityInfo { 644 - (void)setIdentityInfo:(const WebsiteSettingsUI::IdentityInfo&)identityInfo {
645 [identityField_ 645 [identityField_
646 setStringValue:base::SysUTF8ToNSString(identityInfo.site_identity)]; 646 setStringValue:base::SysUTF8ToNSString(identityInfo.site_identity)];
647 [securitySummaryField_ setStringValue:base::SysUTF16ToNSString( 647 [securitySummaryField_ setStringValue:base::SysUTF16ToNSString(
648 identityInfo.GetSecuritySummary())]; 648 identityInfo.GetSecuritySummary())];
649 649
650 certificateId_ = identityInfo.cert_id; 650 certificateId_ = identityInfo.cert_id;
651 651
652 if (identityInfo.show_ssl_decision_revoke_button) { 652 if (certificateId_ && identityInfo.show_ssl_decision_revoke_button) {
653 NSString* text = l10n_util::GetNSString( 653 NSString* text = l10n_util::GetNSString(
654 IDS_PAGEINFO_RESET_INVALID_CERTIFICATE_DECISIONS_BUTTON); 654 IDS_PAGEINFO_RESET_INVALID_CERTIFICATE_DECISIONS_BUTTON);
655 resetDecisionsButton_ = 655 resetDecisionsButton_ =
656 [self addButtonWithText:text toView:securitySectionView_]; 656 [self addButtonWithText:text toView:securitySectionView_];
657 [resetDecisionsButton_ setTarget:self]; 657 [resetDecisionsButton_ setTarget:self];
658 [resetDecisionsButton_ setAction:@selector(resetCertificateDecisions:)]; 658 [resetDecisionsButton_ setAction:@selector(resetCertificateDecisions:)];
659 } 659 }
660 660
661 [self performLayout]; 661 [self performLayout];
662 } 662 }
(...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after
1163 void WebsiteSettingsUIBridge::SetPermissionInfo( 1163 void WebsiteSettingsUIBridge::SetPermissionInfo(
1164 const PermissionInfoList& permission_info_list, 1164 const PermissionInfoList& permission_info_list,
1165 const ChosenObjectInfoList& chosen_object_info_list) { 1165 const ChosenObjectInfoList& chosen_object_info_list) {
1166 [bubble_controller_ setPermissionInfo:permission_info_list 1166 [bubble_controller_ setPermissionInfo:permission_info_list
1167 andChosenObjects:chosen_object_info_list]; 1167 andChosenObjects:chosen_object_info_list];
1168 } 1168 }
1169 1169
1170 void WebsiteSettingsUIBridge::SetSelectedTab(TabId tab_id) { 1170 void WebsiteSettingsUIBridge::SetSelectedTab(TabId tab_id) {
1171 // TODO(lgarron): Remove this from the interface. (crbug.com/571533) 1171 // TODO(lgarron): Remove this from the interface. (crbug.com/571533)
1172 } 1172 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698