fix GridLayout::CreatePanel for new style dialogs

ui/views/layout/grid_layout.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/layout/grid_layout.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "ui/gfx/insets.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/view.h"
+#include "ui/views/window/dialog_delegate.h"
 
 namespace views {
 
 // LayoutElement ------------------------------------------------------
 
 // A LayoutElement has a size and location along one axis. It contains
 // methods that are used along both axis.
 class LayoutElement {
  public:
   // Invokes ResetSize on all the layout elements.
@@ skipping 644 matching lines @@
 
 GridLayout::~GridLayout() {
   STLDeleteElements(&column_sets_);
   STLDeleteElements(&view_states_);
   STLDeleteElements(&rows_);
 }
 
 // static
 GridLayout* GridLayout::CreatePanel(View* host) {
   GridLayout* layout = new GridLayout(host);
-  layout->SetInsets(kPanelVertMargin, kPanelHorizMargin,
-                    kPanelVertMargin, kPanelHorizMargin);
+
+  int horizontal_margin = DialogDelegate::UseNewStyle() ?
+      kButtonHEdgeMarginNew : kPanelHorizMargin;
+
+  layout->SetInsets(kPanelVertMargin, horizontal_margin,
+                    kPanelVertMargin, horizontal_margin);
   return layout;
 }
 
 void GridLayout::SetInsets(int top, int left, int bottom, int right) {
   insets_.Set(top, left, bottom, right);
 }
 
 void GridLayout::SetInsets(const gfx::Insets& insets) {
   insets_ = insets;
 }
@@ skipping 367 matching lines @@
 
 ColumnSet* GridLayout::GetLastValidColumnSet() {
   for (int i = current_row_ - 1; i >= 0; --i) {
     if (rows_[i]->column_set())
       return rows_[i]->column_set();
   }
   return NULL;
 }
 
 }  // namespace views