Views - fix up layout of a couple dialogs

chrome/browser/ui/views/website_settings/permissions_bubble_view.cc

 // Copyright 2014 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/permissions_bubble_view.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
@@ skipping 26 matching lines @@
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
+#include "ui/views/layout/layout_constants.h"
 
 namespace {
 
 // Spacing between major items should be 9px.
 const int kItemMajorSpacing = 9;
 
 // Button border size, draws inside the spacing distance.
 const int kButtonBorderSize = 2;
 
 // (Square) pixel size of icon.
 const int kIconSize = 18;
 
-// Number of pixels to indent the permission request labels.
-const int kPermissionIndentSpacing = 12;
-
 }  // namespace
 
 // This class is a MenuButton which is given a PermissionMenuModel. It
 // shows the current checked item in the menu model, and notifies its listener
 // about any updates to the state of the selection.
 // TODO(gbillock): refactor PermissionMenuButton to work like this and re-use?
 class PermissionCombobox : public views::MenuButton,
                            public views::MenuButtonListener {
  public:
   // Get notifications when the selection changes.
@@ skipping 156 matching lines @@
     row->SetLayoutManager(row_layout);
     views::ColumnSet* columns = row_layout->AddColumnSet(0);
     columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::FILL,
                        0, views::GridLayout::USE_PREF, 0, 0);
     columns->AddColumn(views::GridLayout::TRAILING, views::GridLayout::FILL,
                        100, views::GridLayout::USE_PREF, 0, 0);
     row_layout->StartRow(0, 0);
 
     views::View* label_container = new views::View();
     label_container->SetLayoutManager(new views::BoxLayout(
-        views::BoxLayout::kHorizontal, kPermissionIndentSpacing, 0, 0));

[Evan Stade, 2016/02/08 23:00:49]

this 0 used to be kBubbleOuterMargin (5) but I deleted it because I was getting
rid of custom margins. Turns out that was over-zealous because we do need some
value here, so I changed to kItemLabelSpacing.

[msw, 2016/02/09 00:04:36]

Is this for 585076? It doesn't seem like a 0 here would have caused too much
padding there, nor do I see where this CL attempts to fix that defect.

[Evan Stade, 2016/02/09 23:47:58]

sorry, wrong bug, should have been crbug.com/585014

crbug.com/585076 is not related to my recent bubble work (as you can see the
bisect predates the bubble changes)

+        views::BoxLayout::kHorizontal, views::kCheckboxIndent, 0,
+        views::kItemLabelSpacing));
     views::ImageView* icon = new views::ImageView();
     gfx::VectorIconId vector_id = requests[index]->GetVectorIconId();
     if (vector_id != gfx::VectorIconId::VECTOR_ICON_NONE) {
       icon->SetImage(
           gfx::CreateVectorIcon(vector_id, kIconSize, gfx::kChromeIconGrey));
     } else {
       icon->SetImage(bundle.GetImageSkiaNamed(requests.at(index)->GetIconId()));
       icon->SetImageSize(gfx::Size(kIconSize, kIconSize));
     }
     icon->SetTooltipText(base::string16());  // Redundant with the text fragment
@@ skipping 247 matching lines @@
 
 void PermissionBubbleViewViews::Accept() {
   if (delegate_)
     delegate_->Accept();
 }
 
 void PermissionBubbleViewViews::Deny() {
   if (delegate_)
     delegate_->Deny();
 }