fix GridLayout::CreatePanel for new style dialogs

ui/views/layout/grid_layout.cc

Index: ui/views/layout/grid_layout.cc
diff --git a/ui/views/layout/grid_layout.cc b/ui/views/layout/grid_layout.cc
index ae8ba02e46ec9c0e7c167e2d5366d014b47ec82a..6c2f8992b86aed62ac4960edc8b5c80f020f8ef3 100644
--- a/ui/views/layout/grid_layout.cc
+++ b/ui/views/layout/grid_layout.cc
@@ -11,6 +11,7 @@
 #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 {
 
@@ -675,8 +676,12 @@ GridLayout::~GridLayout() {
 // static
 GridLayout* GridLayout::CreatePanel(View* host) {
   GridLayout* layout = new GridLayout(host);
-  layout->SetInsets(kPanelVertMargin, kPanelHorizMargin,
-                    kPanelVertMargin, kPanelHorizMargin);
+
+  int horizontal_margin = DialogDelegate::UseNewStyle() ?

[msw, 2013/04/16 01:58:24]

nit: const

[Evan Stade, 2013/04/16 19:58:25]

Done.

+      kButtonHEdgeMarginNew : kPanelHorizMargin;
+
+  layout->SetInsets(kPanelVertMargin, horizontal_margin,
+                    kPanelVertMargin, horizontal_margin);
   return layout;
 }