fix GridLayout::CreatePanel for new style dialogs

chrome/browser/ui/views/importer/import_lock_dialog_view.cc

Index: chrome/browser/ui/views/importer/import_lock_dialog_view.cc
diff --git a/chrome/browser/ui/views/importer/import_lock_dialog_view.cc b/chrome/browser/ui/views/importer/import_lock_dialog_view.cc
index 73bdd909fea65ebeb1e529a603ca69b6158db2e5..c35eb7e26281d47ba8a4498b91ea6a31f9472be7 100644
--- a/chrome/browser/ui/views/importer/import_lock_dialog_view.cc
+++ b/chrome/browser/ui/views/importer/import_lock_dialog_view.cc
@@ -60,11 +60,19 @@ gfx::Size ImportLockDialogView::GetPreferredSize() {
 }
 
 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(