PageInfo bubble: Use the non-client view's window title and close button.

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 <stddef.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 117 matching lines @@
 
   // Sets the security details for the current page.
   void SetDetails(const base::string16& details_text);
 
   void AddResetDecisionsLabel();
 
  private:
   // The listener for the styled labels in this view.
   views::StyledLabelListener* styled_label_listener_;
 
-  // The label that displays security summary for the current page.
-  views::Label* summary_label_;
-
   // The label that displays the status of the identity check for this site.
   // Includes a link to open the Chrome Help Center article about connection
   // security.
   views::StyledLabel* details_label_;
 
   // A container for the styled label with a link for resetting cert decisions.
   // This is only shown sometimes, so we use a container to keep track of
   // where to place it (if needed).
   views::View* reset_decisions_label_container_;
   views::StyledLabel* reset_decisions_label_;
@@ skipping 26 matching lines @@
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // Popup Header
 ////////////////////////////////////////////////////////////////////////////////
 
 PopupHeaderView::PopupHeaderView(
     views::ButtonListener* button_listener,
     views::StyledLabelListener* styled_label_listener)
     : styled_label_listener_(styled_label_listener),
-      summary_label_(nullptr),
       details_label_(nullptr),
       reset_decisions_label_container_(nullptr),
       reset_decisions_label_(nullptr) {
   views::GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
 
-  const int label_column = 0;

[lgarron, 2016/12/14 23:46:23]

yaaaaaaaaaaaay good riddance :-D

I've added 640851 to BUG=.

-  views::ColumnSet* column_set = layout->AddColumnSet(label_column);
-  column_set->AddPaddingColumn(0, kSectionPaddingHorizontal);
-  column_set->AddColumn(views::GridLayout::FILL,
-                        views::GridLayout::FILL,
-                        1,
-                        views::GridLayout::USE_PREF,
-                        0,
-                        0);
-  column_set->AddPaddingColumn(1, 0);
-  column_set->AddColumn(views::GridLayout::FILL,
-                        views::GridLayout::FILL,
-                        1,
-                        views::GridLayout::USE_PREF,
-                        0,
-                        0);
-  column_set->AddPaddingColumn(0, kHeaderPaddingForCloseButton);
-
-  // First we add the padding needed for the close button.
-  // In order to move down the summary, we simulate additional padding by giving
-  // it an empty border on top later on.
-  layout->AddPaddingRow(0, kHeaderPaddingForCloseButton);
-
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-
-  layout->StartRow(0, label_column);
-  const gfx::FontList& font_list = rb.GetFontListWithDelta(1);
-  summary_label_ = new views::Label(base::string16(), font_list);
-  summary_label_->SetMultiLine(true);
-  summary_label_->SetBorder(views::CreateEmptyBorder(
-      kHeaderPaddingTop - kHeaderPaddingForCloseButton, 0, 0, 0));
-  layout->AddView(summary_label_, 1, 1, views::GridLayout::LEADING,
-                  views::GridLayout::TRAILING);
-  views::ImageButton* close_button = new views::ImageButton(button_listener);
-  close_button->set_id(BUTTON_CLOSE);
-  close_button->SetImage(views::CustomButton::STATE_NORMAL,
-                         rb.GetImageNamed(IDR_CLOSE_2).ToImageSkia());
-  close_button->SetImage(views::CustomButton::STATE_HOVERED,
-                         rb.GetImageNamed(IDR_CLOSE_2_H).ToImageSkia());
-  close_button->SetImage(views::CustomButton::STATE_PRESSED,
-                         rb.GetImageNamed(IDR_CLOSE_2_P).ToImageSkia());
-  layout->AddView(close_button, 1, 1, views::GridLayout::TRAILING,
-                  views::GridLayout::LEADING);
-
-  layout->AddPaddingRow(0, kHeaderLabelSpacing);
-
   const int label_column_status = 1;
   views::ColumnSet* column_set_status =
       layout->AddColumnSet(label_column_status);
   column_set_status->AddPaddingColumn(0, kSectionPaddingHorizontal);
   column_set_status->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
                                1, views::GridLayout::USE_PREF, 0, 0);
   column_set_status->AddPaddingColumn(0, kSectionPaddingHorizontal);
 
   layout->AddPaddingRow(0, kHeaderLabelSpacing);
 
   layout->StartRow(0, label_column_status);
   details_label_ =
       new views::StyledLabel(base::string16(), styled_label_listener);
   details_label_->set_id(STYLED_LABEL_SECURITY_DETAILS);
   layout->AddView(details_label_, 1, 1, views::GridLayout::FILL,
                   views::GridLayout::LEADING);
 
   layout->StartRow(0, label_column_status);
   reset_decisions_label_container_ = new views::View();
   reset_decisions_label_container_->SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0));
   layout->AddView(reset_decisions_label_container_, 1, 1,
                   views::GridLayout::FILL, views::GridLayout::LEADING);
 
   layout->AddPaddingRow(1, kHeaderPaddingBottom);
 }
 
 PopupHeaderView::~PopupHeaderView() {}
 
-void PopupHeaderView::SetSummary(const base::string16& summary_text) {
-  summary_label_->SetText(summary_text);
-}
-
 void PopupHeaderView::SetDetails(const base::string16& details_text) {
   std::vector<base::string16> subst;
   subst.push_back(details_text);
   subst.push_back(l10n_util::GetStringUTF16(IDS_LEARN_MORE));
 
   std::vector<size_t> offsets;
 
   base::string16 text = base::ReplaceStringPlaceholders(
       base::ASCIIToUTF16("$1 $2"), subst, &offsets);
   details_label_->SetText(text);
@@ skipping 196 matching lines @@
   layout->AddView(separator_);
 
   layout->AddPaddingRow(1, kHeaderMarginBottom);
   layout->StartRow(1, content_column);
 
   site_settings_view_ = CreateSiteSettingsView();
   layout->AddView(site_settings_view_);
 
   // Each section handles its own padding.
   set_margins(gfx::Insets(0, 0, kPopupMarginBottom, 0));
+  set_title_margins(gfx::Insets(kHeaderPaddingTop, kSectionPaddingHorizontal,
+                                kHeaderLabelSpacing,
+                                kHeaderPaddingForCloseButton));
 
   views::BubbleDialogDelegateView::CreateBubble(this);
 
   presenter_.reset(new WebsiteSettings(
       this, profile, TabSpecificContentSettings::FromWebContents(web_contents),
       web_contents, url, security_info));
 }
 
 void WebsiteSettingsPopupView::RenderFrameDeleted(
     content::RenderFrameHost* render_frame_host) {
@@ skipping 11 matching lines @@
   // The menu buttons for the permissions might have longer strings now, so we
   // need to size the whole bubble.
   SizeToContents();
 }
 
 void WebsiteSettingsPopupView::OnChosenObjectDeleted(
     const WebsiteSettingsUI::ChosenObjectInfo& info) {
   presenter_->OnSiteChosenObjectDeleted(info.ui_info, *info.object);
 }
 
+base::string16 WebsiteSettingsPopupView::GetWindowTitle() const {
+  return summary_text_;
+}
+
+bool WebsiteSettingsPopupView::ShouldShowCloseButton() const {
+  return true;
+}
+
 void WebsiteSettingsPopupView::OnWidgetDestroying(views::Widget* widget) {
   g_shown_popup_type = POPUP_NONE;
   presenter_->OnUIClosing();
 }
 
 int WebsiteSettingsPopupView::GetDialogButtons() const {
   return ui::DIALOG_BUTTON_NONE;
 }
 
+const gfx::FontList& WebsiteSettingsPopupView::GetTitleFontList() const {

[lgarron, 2016/12/14 23:46:23]

It seems we're implementing this to make the font slightly larger. Would you
mind adding a comment to document that purpose, in case this gets refactored
further?

[tapted, 2017/01/04 00:36:49]

Done. Added a constant, with a comment. (we actually get a smaller font than
what the default bubble title uses)

+  return ui::ResourceBundle::GetSharedInstance().GetFontListWithDelta(1);
+}
+
 void WebsiteSettingsPopupView::ButtonPressed(views::Button* button,
                                              const ui::Event& event) {
   DCHECK_EQ(BUTTON_CLOSE, button->id());
   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
@@ skipping 156 matching lines @@
   site_settings_view_->AddChildView(link_section);
 
   SizeToContents();
 }
 
 void WebsiteSettingsPopupView::SetIdentityInfo(
     const IdentityInfo& identity_info) {
   std::unique_ptr<WebsiteSettingsUI::SecurityDescription> security_description =
       identity_info.GetSecurityDescription();
 
-  header_->SetSummary(security_description->summary);
+  summary_text_ = security_description->summary;
+  GetWidget()->UpdateWindowTitle();
 
   if (identity_info.certificate) {
     certificate_ = identity_info.certificate;
 
     if (identity_info.show_ssl_decision_revoke_button)
       header_->AddResetDecisionsLabel();
   }
 
   header_->SetDetails(security_description->details);
 
@@ skipping 63 matching lines @@
           WebsiteSettings::WEBSITE_SETTINGS_CONNECTION_HELP_OPENED);
       break;
     case STYLED_LABEL_RESET_CERTIFICATE_DECISIONS:
       presenter_->OnRevokeSSLErrorBypassButtonPressed();
       GetWidget()->Close();
       break;
     default:
       NOTREACHED();
   }
 }