Revert "Add button to page info to revoke user certificate decisions."

chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.h"
 
 #include <cmath>
 
 #import <AppKit/AppKit.h>
 
 #include "base/mac/bind_objc_block.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/sys_string_conversions.h"
 #import "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/infobars/infobar_service.h"
-#include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h"
 #import "chrome/browser/ui/browser_dialogs.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #import "chrome/browser/ui/cocoa/website_settings/permission_selector_button.h"
 #include "chrome/browser/ui/website_settings/permission_menu_model.h"
 #include "chrome/browser/ui/website_settings/website_settings_utils.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/cert_store.h"
 #include "content/public/browser/page_navigator.h"
-#include "content/public/browser/ssl_host_state_delegate.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #import "ui/base/cocoa/controls/hyperlink_button_cell.h"
 #import "ui/base/cocoa/flipped_view.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 471 matching lines @@
       base::UserMetricsAction("WebsiteSettings_CookiesDialogOpened"));
   chrome::ShowCollectedCookiesDialog(webContents_);
 }
 
 // Handler for the link button to show certificate information.
 - (void)showCertificateInfo:(id)sender {
   DCHECK(certificateId_);
   ShowCertificateViewerByID(webContents_, [self parentWindow], certificateId_);
 }
 
-// Handler for the link button to revoke user certificate decisions.
-- (void)resetCertificateDecisions:(id)sender {
-  DCHECK(resetDecisionsButton_);
-  ChromeSSLHostStateDelegate* delegate =
-      presenter_->chrome_ssl_host_state_delegate();
-  DCHECK(delegate);
-  delegate->RevokeUserDecisionsHard(presenter_->site_url().host());
-  [self close];
-}
-
 // Handler for the link to show help information about the connection tab.
 - (void)showHelpPage:(id)sender {
   webContents_->OpenURL(content::OpenURLParams(
       GURL(chrome::kPageInfoHelpCenterURL), content::Referrer(),
       NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false));
 }
 
 // Create the contents of the Connection tab and add it to the given tab view.
 // Returns a weak reference to the tab view item's view.
 - (NSView*)addConnectionTabToTabView:(NSTabView*)tabView {
@@ skipping 26 matching lines @@
   connectionStatusIcon_ = [self addImageWithSize:imageSize
                                           toView:contentView
                                          atPoint:imagePosition];
   connectionStatusDescriptionField_ =
       [self addText:base::string16()
            withSize:[NSFont smallSystemFontSize]
                bold:NO
              toView:contentView.get()
             atPoint:textPosition];
   certificateInfoButton_ = nil;  // This will be created only if necessary.
-  resetDecisionsButton_ = nil;   // This will be created only if necessary.
   separatorAfterConnection_ = [self addSeparatorToView:contentView];
   [separatorAfterConnection_ setAutoresizingMask:NSViewWidthSizable];
 
   firstVisitIcon_ = [self addImageWithSize:imageSize
                                     toView:contentView
                                    atPoint:imagePosition];
   firstVisitHeaderField_ =
       [self addText:l10n_util::GetStringUTF16(IDS_PAGE_INFO_SITE_INFO_TITLE)
            withSize:[NSFont smallSystemFontSize]
                bold:YES
@@ skipping 78 matching lines @@
   yPos = std::max(NSMaxY([identityStatusDescriptionField_ frame]),
                   NSMaxY([identityStatusIcon_ frame]));
   if (certificateInfoButton_) {
     NSRect certificateButtonFrame = [certificateInfoButton_ frame];
     certificateButtonFrame.origin.x = NSMinX(
         [identityStatusDescriptionField_ frame]);
     certificateButtonFrame.origin.y = yPos + kVerticalSpacing;
     [certificateInfoButton_ setFrame:certificateButtonFrame];
     yPos = NSMaxY(certificateButtonFrame);
   }
-  if (resetDecisionsButton_) {
-    NSRect resetDecisionsButtonFrame = [resetDecisionsButton_ frame];
-    resetDecisionsButtonFrame.origin.x =
-        NSMinX([identityStatusDescriptionField_ frame]);
-    resetDecisionsButtonFrame.origin.y = yPos + kVerticalSpacing;
-    [resetDecisionsButton_ setFrame:resetDecisionsButtonFrame];
-    yPos = NSMaxY(resetDecisionsButtonFrame);
-  }
   yPos = [self setYPositionOfView:separatorAfterIdentity_
                                to:yPos + kVerticalSpacing];
   yPos += kVerticalSpacing;
 
   // Lay out the connection status section.
   [self sizeTextFieldHeightToFit:connectionStatusDescriptionField_];
   [self setYPositionOfView:connectionStatusIcon_ to:yPos];
   [self setYPositionOfView:connectionStatusDescriptionField_ to:yPos];
   yPos = std::max(NSMaxY([connectionStatusDescriptionField_ frame]),
                   NSMaxY([connectionStatusIcon_ frame]));
@@ skipping 153 matching lines @@
   [cell setControlSize:NSSmallControlSize];
   [button setCell:cell.get()];
   [button setButtonType:NSMomentaryPushInButton];
   [button setBezelStyle:NSRegularSquareBezelStyle];
   [view addSubview:button.get()];
 
   [GTMUILocalizerAndLayoutTweaker sizeToFitView:button.get()];
   return button.get();
 }
 
-// Add a button with the given text to |view| setting the max size appropriately
-// for the connection info section.
-- (NSButton*)addButtonWithTextToConnectionSection:(NSString*)text
-                                           toView:(NSView*)view {
-  NSRect containerFrame = [view frame];
-  // Frame size is arbitrary; it will be adjusted by the layout tweaker.
-  NSRect frame = NSMakeRect(kFramePadding, 0, 100, 10);
-  base::scoped_nsobject<NSButton> button(
-      [[NSButton alloc] initWithFrame:frame]);
-
-  // Determine the largest possible size for this button. The size is the width
-  // of the connection section minus the padding on both sides minus the
-  // connection image size and spacing.
-  CGFloat maxTitleWidth = containerFrame.size.width - kFramePadding * 2 -
-                          kConnectionImageSize - kConnectionImageSpacing;
-
-  base::scoped_nsobject<NSButtonCell> cell(
-      [[NSButtonCell alloc] initTextCell:text]);
-  [button setCell:cell.get()];
-  [GTMUILocalizerAndLayoutTweaker sizeToFitView:button.get()];
-
-  // Ensure the containing view is large enough to contain the button with its
-  // widest possible title.
-  NSRect buttonFrame = [button frame];
-  buttonFrame.size.width = maxTitleWidth;
-
-  [button setFrame:buttonFrame];
-  [button setButtonType:NSMomentaryPushInButton];
-  [button setBezelStyle:NSRegularSquareBezelStyle];
-  [view addSubview:button.get()];
-
-  return button.get();
-}
-
 // Add a pop-up button for |permissionInfo| to the given view.
 - (NSPopUpButton*)addPopUpButtonForPermission:
     (const WebsiteSettingsUI::PermissionInfo&)permissionInfo
                                        toView:(NSView*)view
                                       atPoint:(NSPoint)point {
 
   GURL url = webContents_ ? webContents_->GetURL() : GURL();
   __block WebsiteSettingsBubbleController* weakSelf = self;
   PermissionMenuModel::ChangeCallback callback =
       base::BindBlock(^(const WebsiteSettingsUI::PermissionInfo& permission) {
@@ skipping 145 matching lines @@
   certificateId_ = identityInfo.cert_id;
   if (certificateId_) {
     if (!certificateInfoButton_) {
       NSString* text = l10n_util::GetNSString(IDS_PAGEINFO_CERT_INFO_BUTTON);
       certificateInfoButton_ = [self addLinkButtonWithText:text
           toView:connectionTabContentView_];
 
       [certificateInfoButton_ setTarget:self];
       [certificateInfoButton_ setAction:@selector(showCertificateInfo:)];
     }
-
-    // Check if a security decision has been made, and if so, add a button to
-    // allow the user to retract their decision.
-    if (identityInfo.show_ssl_decision_revoke_button) {
-      NSString* text = l10n_util::GetNSString(
-          IDS_PAGEINFO_RESET_INVALID_CERTIFICATE_DECISIONS_BUTTON);
-      resetDecisionsButton_ =
-          [self addButtonWithTextToConnectionSection:text
-                                              toView:connectionTabContentView_];
-      [resetDecisionsButton_ setTarget:self];
-      [resetDecisionsButton_ setAction:@selector(resetCertificateDecisions:)];
-    }
   } else {
     certificateInfoButton_ = nil;
   }
 
   [identityStatusIcon_ setImage:WebsiteSettingsUI::GetIdentityIcon(
       identityInfo.identity_status).ToNSImage()];
   [identityStatusDescriptionField_ setStringValue:
       base::SysUTF8ToNSString(identityInfo.identity_status_description)];
 
   [connectionStatusIcon_ setImage:WebsiteSettingsUI::GetConnectionIcon(
@@ skipping 147 matching lines @@
   [bubble_controller_ setPermissionInfo:permission_info_list];
 }
 
 void WebsiteSettingsUIBridge::SetFirstVisit(const base::string16& first_visit) {
   [bubble_controller_ setFirstVisit:first_visit];
 }
 
 void WebsiteSettingsUIBridge::SetSelectedTab(TabId tab_id) {
   [bubble_controller_ setSelectedTab:tab_id];
 }