Fix alignment of title/content on the OIB / Site Settings 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 60 matching lines @@
 // showing.
 WebsiteSettingsPopupView::PopupType g_shown_popup_type =
     WebsiteSettingsPopupView::POPUP_NONE;
 
 // General constants -----------------------------------------------------------
 
 // Popup width constraints.
 const int kMinPopupWidth = 320;
 const int kMaxPopupWidth = 1000;
 
-// Margin and padding values shared by all sections.
-const int kSectionPaddingHorizontal = views::kPanelHorizMargin;
-
-// Padding for the bottom of the bubble.
-const int kPopupMarginBottom = views::kPanelVertMargin;
-
 // Security Section (PopupHeaderView) ------------------------------------------
 
 // Margin and padding values for the |PopupHeaderView|.
 const int kHeaderMarginBottom = 10;
 const int kHeaderPaddingBottom = views::kPanelVertMargin;
 
 // Spacing between labels in the header.
 const int kHeaderLabelSpacing = 4;
 
 // Site Settings Section -------------------------------------------------------
@@ skipping 92 matching lines @@
     : 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->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);
 
@@ skipping 215 matching lines @@
   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();
   layout->AddView(site_settings_view_);
 
-  // Each section handles its own padding.
-  set_margins(gfx::Insets(0, 0, kPopupMarginBottom, 0));
+  // 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()));
+  }
   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) {
   if (render_frame_host == web_contents()->GetMainFrame())
@@ skipping 231 matching lines @@
   SizeToContents();
 }
 
 views::View* WebsiteSettingsPopupView::CreateSiteSettingsView() {
   views::View* site_settings_view = new views::View();
   views::BoxLayout* box_layout =
       new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0);
   site_settings_view->SetLayoutManager(box_layout);
   box_layout->set_cross_axis_alignment(
       views::BoxLayout::CROSS_AXIS_ALIGNMENT_STRETCH);
-  box_layout->set_inside_border_insets(
-      gfx::Insets(0, kSectionPaddingHorizontal));
 
   // Add cookies view.
   cookies_view_ = new views::View();
   site_settings_view->AddChildView(cookies_view_);
 
   return site_settings_view;
 }
 
 void WebsiteSettingsPopupView::HandleLinkClickedAsync(views::Link* source) {
   // Both switch cases require accessing web_contents(), so we check it here.
@@ skipping 36 matching lines @@
           WebsiteSettings::WEBSITE_SETTINGS_CONNECTION_HELP_OPENED);
       break;
     case STYLED_LABEL_RESET_CERTIFICATE_DECISIONS:
       presenter_->OnRevokeSSLErrorBypassButtonPressed();
       GetWidget()->Close();
       break;
     default:
       NOTREACHED();
   }
 }