fix GridLayout::CreatePanel for new style dialogs

chrome/browser/ui/views/importer/import_lock_dialog_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 "chrome/browser/ui/views/importer/import_lock_dialog_view.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/importer/importer_host.h"
@@ skipping 42 matching lines @@
 ImportLockDialogView::~ImportLockDialogView() {
 }
 
 gfx::Size ImportLockDialogView::GetPreferredSize() {
   return gfx::Size(views::Widget::GetLocalizedContentsSize(
       IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS,
       IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES));
 }
 
 void ImportLockDialogView::Layout() {
-  description_label_->SetBounds(
-      views::kPanelHorizMargin,
-      views::kPanelVertMargin,
-      width() - 2 * views::kPanelHorizMargin,
-      height() - 2 * views::kPanelVertMargin);
+  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() ? ... : ...

+    description_label_->SetBounds(
+        views::kButtonHEdgeMargin,
+        views::kPanelVertMargin,
+        width() - 2 * views::kButtonHEdgeMargin,
+        height() - 2 * views::kPanelVertMargin);
+  } else {
+    description_label_->SetBounds(
+        views::kPanelHorizMargin,
+        views::kPanelVertMargin,
+        width() - 2 * views::kPanelHorizMargin,
+        height() - 2 * views::kPanelVertMargin);
+  }
 }
 
 string16 ImportLockDialogView::GetDialogButtonLabel(
     ui::DialogButton button) const {
   return l10n_util::GetStringUTF16((button == ui::DIALOG_BUTTON_OK) ?
       IDS_IMPORTER_LOCK_OK : IDS_IMPORTER_LOCK_CANCEL);
 }
 
 string16 ImportLockDialogView::GetWindowTitle() const {
   return l10n_util::GetStringUTF16(IDS_IMPORTER_LOCK_TITLE);
 }
 
 bool ImportLockDialogView::Accept() {
   MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&ImporterHost::OnImportLockDialogEnd,
                  importer_host_.get(), true));
   return true;
 }
 
 bool ImportLockDialogView::Cancel() {
   MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&ImporterHost::OnImportLockDialogEnd,
                  importer_host_.get(), false));
   return true;
 }