fix GridLayout::CreatePanel for new style dialogs

chrome/browser/chromeos/power/idle_action_warning_dialog_view.cc

 // Copyright 2013 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/chromeos/power/idle_action_warning_dialog_view.h"
 
 #include "ash/shell.h"
 #include "grit/generated_resources.h"
 #include "ui/aura/root_window.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 39 matching lines @@
 gfx::Size FixedWidthLabel::GetPreferredSize() {
   return gfx::Size(width_, GetHeightForWidth(width_));
 }
 
 }  // namespace
 
 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());
 
   views::Widget::CreateWindowWithContext(this,
                                          ash::Shell::GetPrimaryRootWindow());
   GetWidget()->Show();
 }
 
 void IdleActionWarningDialogView::Close() {
   closing_ = true;
@@ skipping 13 matching lines @@
 }
 
 bool IdleActionWarningDialogView::Cancel() {
   return closing_;
 }
 
 IdleActionWarningDialogView::~IdleActionWarningDialogView() {
 }
 
 }  // namespace chromeos