Delete panel metrics and define insets in terms of distance metrics.

chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc

 // Copyright 2013 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/passwords/manage_passwords_bubble_view.h"
 
 #include "base/macros.h"
 #include "base/metrics/user_metrics.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/timer/timer.h"
@@ skipping 169 matching lines @@
   if (model->title_brand_link_range().is_empty())
     return;
 
   views::StyledLabel* title_label =
       new views::StyledLabel(model->title(), listener);
   title_label->SetBaseFontList(views::style::GetFont(
       views::style::CONTEXT_DIALOG_TITLE, views::style::STYLE_PRIMARY));
   title_label->AddStyleRange(model->title_brand_link_range(), GetLinkStyle());
   layout->StartRow(0, SINGLE_VIEW_COLUMN_SET);
   layout->AddView(title_label);
-  layout->AddPaddingRow(
-      0,
-      ChromeLayoutProvider::Get()->GetInsetsMetric(views::INSETS_PANEL).top());
+  layout->AddPaddingRow(0, ChromeLayoutProvider::Get()
+                               ->GetInsetsMetric(views::INSETS_DIALOG_CONTENTS)
+                               .top());
 }
 
 }  // namespace
 
 // ManagePasswordsBubbleView::AutoSigninView ----------------------------------
 
 // A view containing just one credential that was used for for automatic signing
 // in.
 class ManagePasswordsBubbleView::AutoSigninView
     : public views::View,
@@ skipping 132 matching lines @@
       l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_BUBBLE_BLACKLIST_BUTTON));
 
   // Title row.
   BuildColumnSet(layout, SINGLE_VIEW_COLUMN_SET);
   AddTitleRowWithLink(layout, parent_->model(), this);
 
   // Credential row.
   if (item) {
     layout->StartRow(0, SINGLE_VIEW_COLUMN_SET);
     layout->AddView(item);
-    layout->AddPaddingRow(0, ChromeLayoutProvider::Get()
-                                 ->GetInsetsMetric(views::INSETS_PANEL)
-                                 .bottom());
+    layout->AddPaddingRow(0,
+                          ChromeLayoutProvider::Get()
+                              ->GetInsetsMetric(views::INSETS_DIALOG_CONTENTS)
+                              .bottom());
   }
 
   // Button row.
   BuildColumnSet(layout, DOUBLE_BUTTON_COLUMN_SET);
   layout->StartRow(0, DOUBLE_BUTTON_COLUMN_SET);
   layout->AddView(save_button_);
   layout->AddView(never_button_);
 
   parent_->set_initially_focused_view(save_button_);
 }
@@ skipping 83 matching lines @@
   manage_link_ = new views::Link(parent_->model()->manage_link());
   manage_link_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   manage_link_->SetUnderline(false);
   manage_link_->set_listener(this);
 
   done_button_ = views::MdTextButton::CreateSecondaryUiButton(
       this, l10n_util::GetStringUTF16(IDS_DONE));
 
   ChromeLayoutProvider* layout_provider = ChromeLayoutProvider::Get();
   layout->AddPaddingRow(
-      0, layout_provider->GetInsetsMetric(views::INSETS_PANEL).bottom());
+      0,
+      layout_provider->GetInsetsMetric(views::INSETS_DIALOG_CONTENTS).bottom());
   BuildColumnSet(layout, LINK_BUTTON_COLUMN_SET);
   layout->StartRowWithPadding(
       0, LINK_BUTTON_COLUMN_SET, 0,
-      layout_provider->GetInsetsMetric(views::INSETS_DIALOG_BUTTON).top());
+      layout_provider->GetInsetsMetric(views::INSETS_DIALOG_BUTTON_ROW).top());
   layout->AddView(manage_link_);
   layout->AddView(done_button_);
 
   parent_->set_initially_focused_view(done_button_);
 }
 
 ManagePasswordsBubbleView::ManageView::~ManageView() {
 }
 
 void ManagePasswordsBubbleView::ManageView::ButtonPressed(
@@ skipping 54 matching lines @@
 
   BuildColumnSet(layout, SINGLE_VIEW_COLUMN_SET);
   layout->StartRow(0, SINGLE_VIEW_COLUMN_SET);
   layout->AddView(confirmation);
 
   ok_button_ = views::MdTextButton::CreateSecondaryUiButton(
       this, l10n_util::GetStringUTF16(IDS_OK));
 
   ChromeLayoutProvider* layout_provider = ChromeLayoutProvider::Get();
   layout->AddPaddingRow(
-      0, layout_provider->GetInsetsMetric(views::INSETS_PANEL).bottom());
+      0,
+      layout_provider->GetInsetsMetric(views::INSETS_DIALOG_CONTENTS).bottom());
   BuildColumnSet(layout, SINGLE_BUTTON_COLUMN_SET);
-  gfx::Insets button_insets =
-      layout_provider->GetInsetsMetric(views::INSETS_DIALOG_BUTTON);
-  layout->StartRowWithPadding(0, SINGLE_BUTTON_COLUMN_SET, 0,
-                              button_insets.top());
+  layout->StartRowWithPadding(
+      0, SINGLE_BUTTON_COLUMN_SET, 0,
+      layout_provider->GetInsetsMetric(views::INSETS_DIALOG_BUTTON_ROW).top());
   layout->AddView(ok_button_);
 
   parent_->set_initially_focused_view(ok_button_);
 }
 
 ManagePasswordsBubbleView::SaveConfirmationView::~SaveConfirmationView() {
 }
 
 void ManagePasswordsBubbleView::SaveConfirmationView::StyledLabelLinkClicked(
     views::StyledLabel* label,
@@ skipping 127 matching lines @@
       this, l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_UPDATE_BUTTON));
 
   // Title row.
   BuildColumnSet(layout, SINGLE_VIEW_COLUMN_SET);
   AddTitleRowWithLink(layout, parent_->model(), this);
 
   // Credential row.
   layout->StartRow(0, SINGLE_VIEW_COLUMN_SET);
   layout->AddView(item);
   layout->AddPaddingRow(
-      0, layout_provider->GetInsetsMetric(views::INSETS_PANEL).bottom());
+      0,
+      layout_provider->GetInsetsMetric(views::INSETS_DIALOG_CONTENTS).bottom());
 
   // Button row.
   BuildColumnSet(layout, DOUBLE_BUTTON_COLUMN_SET);
   layout->StartRowWithPadding(
       0, DOUBLE_BUTTON_COLUMN_SET, 0,
-      layout_provider->GetInsetsMetric(views::INSETS_DIALOG_BUTTON).top());
+      layout_provider->GetInsetsMetric(views::INSETS_DIALOG_BUTTON_ROW).top());
   layout->AddView(update_button_);
   layout->AddView(nope_button_);
 
   parent_->set_initially_focused_view(update_button_);
 }
 
 ManagePasswordsBubbleView::UpdatePendingView::~UpdatePendingView() {}
 
 void ManagePasswordsBubbleView::UpdatePendingView::ButtonPressed(
     views::Button* sender,
@@ skipping 193 matching lines @@
   } else if (model_.state() ==
              password_manager::ui::CHROME_DESKTOP_IOS_PROMO_STATE) {
     AddChildView(new DesktopIOSPromotionBubbleView(
         model_.GetProfile(),
         desktop_ios_promotion::PromotionEntryPoint::SAVE_PASSWORD_BUBBLE));
 #endif
   } else {
     AddChildView(new ManageView(this));
   }
 }