[merge-m57] Ensure the line on the origin info bubble extends the full width of the bubble.

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 91 matching lines @@
 const int BUTTON_CLOSE = 1337;
 const int STYLED_LABEL_SECURITY_DETAILS = 1338;
 const int STYLED_LABEL_RESET_CERTIFICATE_DECISIONS = 1339;
 const int LINK_COOKIE_DIALOG = 1340;
 const int LINK_SITE_SETTINGS = 1341;
 
 // The default, ui::kTitleFontSizeDelta, is too large for the website settings
 // bubble (e.g. +3). Use +1 to obtain a smaller font.
 constexpr int kSummaryFontSizeDelta = 1;
 
+// Adds a ColumnSet on |layout| with a single View column and padding columns
+// on either side of it with |margin| width.
+void AddColumnWithSideMargin(views::GridLayout* layout, int margin, int id) {
+  views::ColumnSet* column_set = layout->AddColumnSet(id);
+  column_set->AddPaddingColumn(0, margin);
+  column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
+                        views::GridLayout::USE_PREF, 0, 0);
+  column_set->AddPaddingColumn(0, margin);
+}
+
 }  // namespace
 
 // |PopupHeaderView| is the UI element (view) that represents the header of the
 // |WebsiteSettingsPopupView|. The header shows the status of the site's
 // identity check and the name of the site's identity.
 class PopupHeaderView : public views::View {
  public:
-  explicit PopupHeaderView(views::ButtonListener* button_listener,
-                           views::StyledLabelListener* styled_label_listener);
+  PopupHeaderView(views::ButtonListener* button_listener,
+                  views::StyledLabelListener* styled_label_listener,
+                  int side_margin);
   ~PopupHeaderView() override;
 
   // Sets the security summary for the current page.
   void SetSummary(const base::string16& summary_text);
 
   // Sets the security details for the current page.
   void SetDetails(const base::string16& details_text);
 
   void AddResetDecisionsLabel();
 
@@ skipping 41 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(InternalPageInfoPopupView);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // Popup Header
 ////////////////////////////////////////////////////////////////////////////////
 
 PopupHeaderView::PopupHeaderView(
     views::ButtonListener* button_listener,
-    views::StyledLabelListener* styled_label_listener)
+    views::StyledLabelListener* styled_label_listener,
+    int side_margin)
     : styled_label_listener_(styled_label_listener),
       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_status = 1;
-  views::ColumnSet* column_set_status =
-      layout->AddColumnSet(label_column_status);
-  column_set_status->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
-                               1, views::GridLayout::USE_PREF, 0, 0);
-
+  AddColumnWithSideMargin(layout, side_margin, label_column_status);
   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);
@@ skipping 189 matching lines @@
       cookie_dialog_link_(nullptr),
       permissions_view_(nullptr),
       weak_factory_(this) {
   g_shown_popup_type = POPUP_WEBSITE_SETTINGS;
   set_parent_window(parent_window);
 
   // Compensate for built-in vertical padding in the anchor view's image.
   set_anchor_view_insets(gfx::Insets(
       GetLayoutConstant(LOCATION_BAR_BUBBLE_ANCHOR_VERTICAL_INSET), 0));
 
+  // Capture the default bubble margin, and move it to the Layout classes. This
+  // is necessary so that the views::Separator can extend the full width of the
+  // bubble.
+  const int side_margin = margins().left();
+  DCHECK_EQ(margins().left(), margins().right());
+
+  // Also remove the top margin from the client area so there is less space
+  // below the dialog title.
+  set_margins(gfx::Insets(0, 0, margins().bottom(), 0));
+
   views::GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
+
+  // Use a single ColumnSet here. Otherwise the preferred width doesn't properly
+  // propagate up to the dialog width.
   const int content_column = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(content_column);
   column_set->AddColumn(views::GridLayout::FILL,
                         views::GridLayout::FILL,
                         1,
                         views::GridLayout::USE_PREF,
                         0,
                         0);
 
-  header_ = new PopupHeaderView(this, this);
+  header_ = new PopupHeaderView(this, this, side_margin);
   layout->StartRow(1, content_column);
   layout->AddView(header_);
 
   layout->StartRow(0, content_column);
   separator_ = new views::Separator(views::Separator::HORIZONTAL);
   layout->AddView(separator_);
 
   layout->AddPaddingRow(1, kHeaderMarginBottom);
   layout->StartRow(1, content_column);
 
-  site_settings_view_ = CreateSiteSettingsView();
+  site_settings_view_ = CreateSiteSettingsView(side_margin);
   layout->AddView(site_settings_view_);
 
-  // Remove the top margin from the client area so there is less space below the
-  // dialog title.
-  set_margins(
-      gfx::Insets(0, margins().left(), margins().bottom(), margins().right()));
   if (!ui::MaterialDesignController::IsSecondaryUiMaterial()) {
     // In non-material, titles are inset from the dialog margin. Ensure the
     // horizontal insets match.
-    set_title_margins(gfx::Insets(views::kPanelVertMargin, margins().left(), 0,
-                                  margins().right()));
+    set_title_margins(
+        gfx::Insets(views::kPanelVertMargin, side_margin, 0, side_margin));
   }
   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 225 matching lines @@
     if (identity_info.show_ssl_decision_revoke_button)
       header_->AddResetDecisionsLabel();
   }
 
   header_->SetDetails(security_description->details);
 
   Layout();
   SizeToContents();
 }
 
-views::View* WebsiteSettingsPopupView::CreateSiteSettingsView() {
+views::View* WebsiteSettingsPopupView::CreateSiteSettingsView(int side_margin) {
   views::View* site_settings_view = new views::View();
   views::BoxLayout* box_layout =
-      new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0);
+      new views::BoxLayout(views::BoxLayout::kVertical, side_margin, 0, 0);
   site_settings_view->SetLayoutManager(box_layout);
   box_layout->set_cross_axis_alignment(
       views::BoxLayout::CROSS_AXIS_ALIGNMENT_STRETCH);
 
   // Add cookies view.
   cookies_view_ = new views::View();
   site_settings_view->AddChildView(cookies_view_);
 
   return site_settings_view;
 }
@@ skipping 39 matching lines @@
           WebsiteSettings::WEBSITE_SETTINGS_CONNECTION_HELP_OPENED);
       break;
     case STYLED_LABEL_RESET_CERTIFICATE_DECISIONS:
       presenter_->OnRevokeSSLErrorBypassButtonPressed();
       GetWidget()->Close();
       break;
     default:
       NOTREACHED();
   }
 }