[WebsiteSettings] Adjust visual margins on permission bubble to match mocks.

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 "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_request.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/text_constants.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
 
+namespace {
+
+// Spacing constant for outer margin. This is added to the
+// bubble margin itself to equalize the margins at 20px.
+const int kBubbleOuterMargin = 12;
+
+// Spacing between major items should be 10px.
+const int kItemMajorSpacing = 10;
+
+// Button border size, draws inside the spacing distance.
+const int kButtonBorderSize = 2;
+
+}  // namespace
+
 // View implementation for the permissions bubble.
 class PermissionsBubbleDelegateView : public views::BubbleDelegateView,
                                       public views::ButtonListener {
  public:
   explicit PermissionsBubbleDelegateView(
       views::View* anchor,
       PermissionBubbleViewViews* owner,
       const std::vector<PermissionBubbleRequest*>& requests,
       const std::vector<bool>& accept_state,
       bool customization_mode);
@@ skipping 31 matching lines @@
     : views::BubbleDelegateView(anchor, views::BubbleBorder::TOP_LEFT),
       owner_(owner),
       allow_(NULL),
       deny_(NULL),
       customize_(NULL) {
   RemoveAllChildViews(true);
   set_close_on_esc(false);
   set_close_on_deactivate(false);
 
   SetLayoutManager(new views::BoxLayout(
-      views::BoxLayout::kVertical, 30, 0, 20));
+      views::BoxLayout::kVertical, kBubbleOuterMargin, 0, kItemMajorSpacing));
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
   if (requests.size() == 1) {
     title_ = requests[0]->GetMessageText();
     if (GetWidget())
       GetWidget()->UpdateWindowTitle();
   } else {
     for (std::vector<PermissionBubbleRequest*>::const_iterator it =
              requests.begin();
@@ skipping 17 matching lines @@
   }
 
   views::View* button_row = new views::View();
   views::GridLayout* button_layout = new views::GridLayout(button_row);
   views::ColumnSet* columns = button_layout->AddColumnSet(0);
   columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER,
                      100.0, views::GridLayout::USE_PREF, 0, 0);
   columns->AddColumn(views::GridLayout::TRAILING, views::GridLayout::FILL,
                      0, views::GridLayout::USE_PREF, 0, 0);
   if (!customization_mode) {
-    columns->AddPaddingColumn(0, 10);  // padding between buttons
+    columns->AddPaddingColumn(0, kItemMajorSpacing - (2*kButtonBorderSize));
     columns->AddColumn(views::GridLayout::TRAILING, views::GridLayout::FILL,
                        0, views::GridLayout::USE_PREF, 0, 0);
   }
 
   button_row->SetLayoutManager(button_layout);
   AddChildView(button_row);
 
   button_layout->StartRow(0, 0);
 
   // Customization case: empty "Customize" label and an "OK" button
   if (customization_mode) {
     button_layout->AddView(new views::View());
 
     views::LabelButton* ok_button =
         new views::LabelButton(this, l10n_util::GetStringUTF16(
             IDS_OK));
     ok_button->SetStyle(views::Button::STYLE_BUTTON);
     button_layout->AddView(ok_button);
     allow_ = ok_button;
 
-    button_layout->AddPaddingRow(0, 12);
+    button_layout->AddPaddingRow(0, kBubbleOuterMargin);
     return;
   }
 
   // Only show the "Customize" button if there is more than one option.
   if (requests.size() > 1) {
     views::LabelButton* customize = new views::LabelButton(this,
         l10n_util::GetStringUTF16(IDS_PERMISSION_CUSTOMIZE));
     customize->SetStyle(views::Button::STYLE_TEXTBUTTON);
     customize->SetTextColor(views::Button::STATE_NORMAL, SK_ColorBLUE);
     customize->SetTextColor(views::Button::STATE_HOVERED, SK_ColorBLUE);
@@ skipping 22 matching lines @@
   deny_button->SetFontList(rb.GetFontList(ui::ResourceBundle::MediumFont));
   button_layout->AddView(deny_button);
   deny_ = deny_button;
 
   views::LabelButton* allow_button = new views::LabelButton(this, allow_text);
   allow_button->SetStyle(views::Button::STYLE_BUTTON);
   allow_button->SetFontList(rb.GetFontList(ui::ResourceBundle::MediumFont));
   button_layout->AddView(allow_button);
   allow_ = allow_button;
 
-  button_layout->AddPaddingRow(0, 30);
+  button_layout->AddPaddingRow(0, kBubbleOuterMargin);
 }
 
 PermissionsBubbleDelegateView::~PermissionsBubbleDelegateView() {
   if (owner_)
     owner_->Closing();
 }
 
 void PermissionsBubbleDelegateView::ResetOwner() {
   owner_ = NULL;
 }
@@ skipping 95 matching lines @@
 
 void PermissionBubbleViewViews::Deny() {
   if (delegate_)
     delegate_->Deny();
 }
 
 void PermissionBubbleViewViews::SetCustomizationMode() {
   if (delegate_)
     delegate_->SetCustomizationMode();
 }