fix GridLayout::CreatePanel for new style dialogs

ui/views/controls/message_box_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 "ui/views/controls/message_box_view.h"
 
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
 #include "base/strings/string_split.h"
 #include "base/utf_string_conversions.h"
@@ skipping 48 matching lines @@
 
 namespace views {
 
 ///////////////////////////////////////////////////////////////////////////////
 // MessageBoxView, public:
 
 MessageBoxView::InitParams::InitParams(const string16& message)
     : options(NO_OPTIONS),
       message(message),
       message_width(kDefaultMessageWidth),
-      top_inset(kPanelVertMargin),
-      bottom_inset(kPanelVertMargin),
-      left_inset(kPanelHorizMargin),
-      right_inset(kPanelHorizMargin),
       inter_row_vertical_spacing(kRelatedControlVerticalSpacing),
-      clipboard_source_tag()
-{
-}
+      clipboard_source_tag() {}
 
 MessageBoxView::InitParams::~InitParams() {
 }
 
 MessageBoxView::MessageBoxView(const InitParams& params)
     : prompt_field_(NULL),
       icon_(NULL),
       checkbox_(NULL),
       message_width_(params.message_width) {
   Init(params);
@@ skipping 101 matching lines @@
     message_label->SetAllowCharacterBreak(true);
     message_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     message_labels_.push_back(message_label);
   }
 
   if (params.options & HAS_PROMPT_FIELD) {
     prompt_field_ = new Textfield;
     prompt_field_->SetText(params.default_prompt);
   }
 
-  top_inset_ = params.top_inset;
-  bottom_inset_ = params.bottom_inset;
-  left_inset_ = params.left_inset;
-  right_inset_ = params.right_inset;
   inter_row_vertical_spacing_ = params.inter_row_vertical_spacing;
   source_tag_ = params.clipboard_source_tag;
 
   ResetLayoutManager();
 }
 
 void MessageBoxView::ResetLayoutManager() {
   // Initialize the Grid Layout Manager used for this dialog box.
   GridLayout* layout = GridLayout::CreatePanel(this);
-  layout->SetInsets(top_inset_, bottom_inset_, left_inset_, right_inset_);
   SetLayoutManager(layout);
 
   gfx::Size icon_size;
   if (icon_)
     icon_size = icon_->GetPreferredSize();
 
   // Add the column set for the message displayed at the top of the dialog box.
   // And an icon, if one has been set.
   const int message_column_view_set_id = 0;
   ColumnSet* column_set = layout->AddColumnSet(message_column_view_set_id);
@@ skipping 50 matching lines @@
   if (checkbox_) {
     layout->AddPaddingRow(0, inter_row_vertical_spacing_);
     layout->StartRow(0, checkbox_column_view_set_id);
     layout->AddView(checkbox_);
   }
 
   layout->AddPaddingRow(0, inter_row_vertical_spacing_);
 }
 
 }  // namespace views