Add button to page info to revoke user certificate decisions.

chrome/browser/ui/views/website_settings/website_settings_popup_view.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/views/website_settings/website_settings_popup_view.h"
 
 #include <algorithm>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/views/collected_cookies_views.h"
 #include "chrome/browser/ui/views/website_settings/permission_selector_view.h"
 #include "chrome/browser/ui/website_settings/website_settings.h"
 #include "chrome/browser/ui/website_settings/website_settings_utils.h"
 #include "chrome/common/url_constants.h"
 #include "components/content_settings/core/common/content_settings_types.h"
+#include "content/browser/ssl/ssl_host_state.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cert_store.h"
 #include "content/public/browser/user_metrics.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 271 matching lines @@
       browser_(browser),
       header_(NULL),
       tabbed_pane_(NULL),
       site_data_content_(NULL),
       cookie_dialog_link_(NULL),
       permissions_content_(NULL),
       connection_tab_(NULL),
       identity_info_content_(NULL),
       certificate_dialog_link_(NULL),
       signed_certificate_timestamps_link_(NULL),
+      reset_decisions_button_(NULL),
       cert_id_(0),
       help_center_link_(NULL),
       connection_info_content_(NULL),
       page_info_content_(NULL),
       weak_factory_(this) {
   // Compensate for built-in vertical padding in the anchor view's image.
   set_anchor_view_insets(gfx::Insets(kLocationIconVerticalMargin, 0,
                                      kLocationIconVerticalMargin, 0));
 
   views::GridLayout* layout = new views::GridLayout(this);
@@ skipping 50 matching lines @@
   presenter_->OnSitePermissionChanged(permission.type, permission.setting);
 }
 
 void WebsiteSettingsPopupView::OnWidgetDestroying(views::Widget* widget) {
   is_popup_showing = false;
   presenter_->OnUIClosing();
 }
 
 void WebsiteSettingsPopupView::ButtonPressed(
     views::Button* button,
     const ui::Event& event) {

[Peter Kasting, 2014/07/26 02:40:39]

Why do we still have this function if it's empty?

[jww, 2014/07/27 17:29:26]

The removal of GetWidget()->Close(); is an accident, so I'll change that back.
Not sure where this method is used at all, though.

-  GetWidget()->Close();
 }
 
 void WebsiteSettingsPopupView::LinkClicked(views::Link* source,
                                            int event_flags) {
   // The popup closes automatically when the collected cookies dialog or the
   // certificate viewer opens. So delay handling of the link clicked to avoid
   // a crash in the base class which needs to complete the mouse event handling.
   content::BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(&WebsiteSettingsPopupView::HandleLinkClickedAsync,
@@ skipping 154 matching lines @@
         l10n_util::GetStringUTF16(IDS_PAGEINFO_CERT_INFO_BUTTON));
     certificate_dialog_link_->set_listener(this);
 
     if (!signed_certificate_timestamp_ids_.empty()) {
       signed_certificate_timestamps_link_ =
           new views::Link(l10n_util::GetStringUTF16(
               IDS_PAGEINFO_CERT_TRANSPARENCY_INFO_BUTTON));
       signed_certificate_timestamps_link_->set_listener(this);
     }
 
+    if (identity_info.certificate_decision_made) {
+      reset_decisions_button_ = new views::Link(l10n_util::GetStringUTF16(
+          IDS_PAGEINFO_RESET_INVALID_CERTIFICATE_DECISIONS_BUTTON));
+      reset_decisions_button_->set_listener(this);
+    }
+
     headline = base::UTF8ToUTF16(identity_info.site_identity);
   }
   ResetConnectionSection(
       identity_info_content_,
       WebsiteSettingsUI::GetIdentityIcon(identity_info.identity_status),
       base::string16(),  // The identity section has no headline.
       base::UTF8ToUTF16(identity_info.identity_status_description),
       certificate_dialog_link_,
-      signed_certificate_timestamps_link_);
+      signed_certificate_timestamps_link_,
+      reset_decisions_button_);
 
   ResetConnectionSection(
       connection_info_content_,
       WebsiteSettingsUI::GetConnectionIcon(identity_info.connection_status),
       base::string16(),  // The connection section has no headline.
       base::UTF8ToUTF16(identity_info.connection_status_description),
       NULL,
+      NULL,
       NULL);
 
   connection_tab_->InvalidateLayout();
   Layout();
   SizeToContents();
 }
 
 void WebsiteSettingsPopupView::SetFirstVisit(
     const base::string16& first_visit) {
   ResetConnectionSection(
       page_info_content_,
       WebsiteSettingsUI::GetFirstVisitIcon(first_visit),
       l10n_util::GetStringUTF16(IDS_PAGE_INFO_SITE_INFO_TITLE),
       first_visit,
       NULL,
+      NULL,
       NULL);
   connection_tab_->InvalidateLayout();
   Layout();
   SizeToContents();
 }
 
 void WebsiteSettingsPopupView::SetSelectedTab(TabId tab_id) {
   tabbed_pane_->SelectTabAt(tab_id);
 }
 
@@ skipping 98 matching lines @@
   layout->AddPaddingRow(1, kPermissionsSectionPaddingBottom);
   return container;
 }
 
 void WebsiteSettingsPopupView::ResetConnectionSection(
     views::View* section_container,
     const gfx::Image& icon,
     const base::string16& headline,
     const base::string16& text,
     views::Link* link,
-    views::Link* secondary_link) {
+    views::Link* secondary_link,
+    views::Link* reset_decisions_button) {
   section_container->RemoveAllChildViews(true);
 
   views::GridLayout* layout = new views::GridLayout(section_container);
   section_container->SetLayoutManager(layout);
   views::ColumnSet* column_set = layout->AddColumnSet(0);
   column_set->AddPaddingColumn(0, kConnectionSectionPaddingLeft);
   column_set->AddColumn(views::GridLayout::LEADING,
                         views::GridLayout::LEADING,
                         0,
                         views::GridLayout::USE_PREF,
@@ skipping 52 matching lines @@
   if (link) {
     content_layout->StartRow(1, 0);
     content_layout->AddView(link);
   }
 
   if (secondary_link) {
     content_layout->StartRow(1, 0);
     content_layout->AddView(secondary_link);
   }
 
+  if (reset_decisions_button) {
+    content_layout->StartRow(1, 0);
+    content_layout->AddView(reset_decisions_button);
+  }
+
   layout->AddView(content_pane, 1, 1, views::GridLayout::LEADING,
                   views::GridLayout::LEADING);
   layout->AddPaddingRow(0, kConnectionSectionPaddingBottom);
 }
 
 // Used to asynchronously handle clicks since these calls may cause the
 // destruction of the settings view and the base class window still
 // needs to be alive to finish handling the mouse click.
 void WebsiteSettingsPopupView::HandleLinkClickedAsync(views::Link* source) {
   if (source == cookie_dialog_link_) {
     // Count how often the Collected Cookies dialog is opened.
     content::RecordAction(
         base::UserMetricsAction("WebsiteSettings_CookiesDialogOpened"));
     new CollectedCookiesViews(web_contents_);
   } else if (source == certificate_dialog_link_) {
     gfx::NativeWindow parent =
         GetAnchorView() ? GetAnchorView()->GetWidget()->GetNativeWindow() :
             NULL;
     ShowCertificateViewerByID(web_contents_, parent, cert_id_);
   } else if (source == signed_certificate_timestamps_link_) {
     chrome::ShowSignedCertificateTimestampsViewer(
         web_contents_, signed_certificate_timestamp_ids_);
   } else if (source == help_center_link_) {
     browser_->OpenURL(content::OpenURLParams(
         GURL(chrome::kPageInfoHelpCenterURL),
         content::Referrer(),
         NEW_FOREGROUND_TAB,
         content::PAGE_TRANSITION_LINK,
         false));
+  } else if (source == reset_decisions_button_) {
+    content::BrowserContext* context = web_contents_->GetBrowserContext();
+    content::SSLHostState::GetFor(context)
+        ->RevokeAllowAndDenyPreferences(presenter_->GetSiteURL().host());

[Peter Kasting, 2014/07/26 02:40:39]

Nit: Wrap like this:

    content::SSLHostState::GetFor(context)->RevokeAllowAndDenyPreferences(
        presenter_->GetSiteURL().host());

[jww, 2014/07/27 17:29:26]

This is actually a git-cl format change. Happy to change to your style if you
have a strong preference.

[Peter Kasting, 2014/07/28 11:07:44]

I'm not sure I'd say "strong" preference, but I've never seen where in the style
guide (which otherwise says to wrap after operators) the exception for the dot
and arrow operators is defined -- but git-cl format will happily wrap before
them.

Personally, this is something like reason number 752 of 1034 never to run git-cl
format.

[jww, 2014/07/28 19:10:00]

Done.

+    GetWidget()->Close();
   }
 }