Correct padding and focus ring for frameless constrained window dialog

chrome/browser/ui/views/tab_modal_confirm_dialog_views.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/tab_modal_confirm_dialog_views.h"
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_list.h"
@@ skipping 16 matching lines @@
   bool enable_chrome_style =
       CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableFramelessConstrainedDialogs);
   return new TabModalConfirmDialogViews(delegate,
                                         tab_contents,
                                         enable_chrome_style);
 }
 
 namespace {
 const int kChromeStyleUniformInset = 0;
-const int kChromeStyleInterRowVerticalSpacing = 20;
+const int kChromeStyleInterRowVerticalSpacing = 17;
 
 const int kChromeStyleButtonVEdgeMargin = 0;
 const int kChromeStyleButtonHEdgeMargin = 0;
 const int kChromeStyleDialogButtonLabelSpacing = 24;
+const int kChromeStyleButtonContentSpacing = 0;
 
 views::MessageBoxView::InitParams CreateMessageBoxViewInitParams(
     const string16& message,
     bool enable_chrome_style)
 {
   views::MessageBoxView::InitParams params(message);
 
   if (enable_chrome_style) {
     params.top_inset = kChromeStyleUniformInset;
     params.bottom_inset = kChromeStyleUniformInset;
@@ skipping 63 matching lines @@
 views::ClientView* TabModalConfirmDialogViews::CreateClientView(
     views::Widget* widget) {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kEnableFramelessConstrainedDialogs)) {
     views::DialogClientView::StyleParams params;
     params.button_vedge_margin = kChromeStyleButtonVEdgeMargin;
     params.button_hedge_margin = kChromeStyleButtonHEdgeMargin;
     params.button_label_spacing = kChromeStyleDialogButtonLabelSpacing;
     params.text_button_factory =
         &views::DialogClientView::CreateChromeStyleDialogButton;
+    params.button_content_spacing = kChromeStyleButtonContentSpacing;
 
     return new views::DialogClientView(widget, GetContentsView(), params);
   }
 
   return DialogDelegate::CreateClientView(widget);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // TabModalConfirmDialogViews, views::WidgetDelegate implementation:
 
 views::View* TabModalConfirmDialogViews::GetContentsView() {
   return message_box_view_;
 }
 
 views::Widget* TabModalConfirmDialogViews::GetWidget() {
   return message_box_view_->GetWidget();
 }
 
 const views::Widget* TabModalConfirmDialogViews::GetWidget() const {
   return message_box_view_->GetWidget();
 }
 
 void TabModalConfirmDialogViews::DeleteDelegate() {
   delete this;
 }