Remove SetSelectedTab() and deprecate unused WebsiteSettingsAction values.

chrome/browser/ui/website_settings/website_settings.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/website_settings/website_settings.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <string>
@@ skipping 647 matching lines @@
     }
   }
 
   // Check if a user decision has been made to allow or deny certificates with
   // errors on this site.
   ChromeSSLHostStateDelegate* delegate =
       ChromeSSLHostStateDelegateFactory::GetForProfile(profile_);
   DCHECK(delegate);
   // Only show an SSL decision revoke button if the user has chosen to bypass
   // SSL host errors for this host in the past.
-  show_ssl_decision_revoke_button_ = delegate->HasAllowException(url.host());
-
-  // By default select the Permissions Tab that displays all the site
-  // permissions. In case of a connection error or an issue with the certificate
-  // presented by the website, select the Connection Tab to draw the user's
-  // attention to the issue. If the site does not provide a certificate because
-  // it was loaded over an unencrypted connection, don't select the Connection
-  // Tab.
-  WebsiteSettingsUI::TabId tab_id = WebsiteSettingsUI::TAB_ID_PERMISSIONS;
-  if (site_connection_status_ == SITE_CONNECTION_STATUS_ENCRYPTED_ERROR ||
-      site_connection_status_ ==
-          SITE_CONNECTION_STATUS_INSECURE_PASSIVE_SUBRESOURCE ||
-      site_connection_status_ ==
-          SITE_CONNECTION_STATUS_INSECURE_ACTIVE_SUBRESOURCE ||
-      site_identity_status_ == SITE_IDENTITY_STATUS_ERROR ||
-      site_identity_status_ == SITE_IDENTITY_STATUS_CERT_REVOCATION_UNKNOWN ||
-      site_identity_status_ == SITE_IDENTITY_STATUS_ADMIN_PROVIDED_CERT ||
-      site_identity_status_ ==
-          SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM_MINOR ||
-      site_identity_status_ ==
-          SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM_MAJOR) {
-    tab_id = WebsiteSettingsUI::TAB_ID_CONNECTION;
-    RecordWebsiteSettingsAction(
-      WEBSITE_SETTINGS_CONNECTION_TAB_SHOWN_IMMEDIATELY);
-  }
-
-  ui_->SetSelectedTab(tab_id);
-}
+  show_ssl_decision_revoke_button_ = delegate->HasAllowException(url.host());}

[msw, 2016/11/29 18:26:03]

nit: fix closing curly brace

[lgarron, 2016/12/16 05:46:59]

Done.

 
 void WebsiteSettings::PresentSitePermissions() {
   PermissionInfoList permission_info_list;
   ChosenObjectInfoList chosen_object_info_list;
 
   WebsiteSettingsUI::PermissionInfo permission_info;
   for (size_t i = 0; i < arraysize(kPermissionType); ++i) {
     permission_info.type = kPermissionType[i];
 
     if (!ShouldShowPermission(permission_info.type))
@@ skipping 85 matching lines @@
   info.connection_status = site_connection_status_;
   info.connection_status_description =
       UTF16ToUTF8(site_connection_details_);
   info.identity_status = site_identity_status_;
   info.identity_status_description =
       UTF16ToUTF8(site_identity_details_);
   info.certificate = certificate_;
   info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_;
   ui_->SetIdentityInfo(info);
 }