fix GridLayout::CreatePanel for new style dialogs

chrome/browser/chromeos/power/idle_action_warning_dialog_view.cc

Index: chrome/browser/chromeos/power/idle_action_warning_dialog_view.cc
diff --git a/chrome/browser/chromeos/power/idle_action_warning_dialog_view.cc b/chrome/browser/chromeos/power/idle_action_warning_dialog_view.cc
index 79b8db51fd4615a1d60f2956ca6c9b33c4f96397..2c221741e20727d2f148f0779a494eab058d40b5 100644
--- a/chrome/browser/chromeos/power/idle_action_warning_dialog_view.cc
+++ b/chrome/browser/chromeos/power/idle_action_warning_dialog_view.cc
@@ -57,9 +57,15 @@ IdleActionWarningDialogView::IdleActionWarningDialogView() : closing_(false) {
   FixedWidthLabel* content = new FixedWidthLabel(
         l10n_util::GetStringUTF16(IDS_IDLE_WARNING_LOGOUT_WARNING),
         kIdleActionWarningContentWidth);
-  content->set_border(views::Border::CreateEmptyBorder(
-      views::kPanelVertMargin, views::kPanelHorizMargin,
-      views::kPanelVertMargin, views::kPanelHorizMargin));
+  if (DialogDelegate::UseNewStyle()) {

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

nit: I prefer the pattern of setting a local first instead:
const int horizontal_margin = DialogDelegate::UseNewStyle() ? ... : ...

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

Normally I do as well, except that this should change soon. It will be easier
(and create a cleaner changelog) to just delete half of the this block.

+    content->set_border(views::Border::CreateEmptyBorder(
+        views::kPanelVertMargin, views::kButtonHEdgeMarginNew,
+        views::kPanelVertMargin, views::kButtonHEdgeMarginNew));
+  } else {
+    content->set_border(views::Border::CreateEmptyBorder(
+        views::kPanelVertMargin, views::kPanelHorizMargin,
+        views::kPanelVertMargin, views::kPanelHorizMargin));
+  }
   AddChildView(content);
   SetLayoutManager(new views::FillLayout());