fix GridLayout::CreatePanel for new style dialogs

chrome/browser/ui/views/extensions/extension_uninstall_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/extensions/extension_uninstall_dialog.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 15 matching lines @@
 #include "ash/shell.h"
 #endif
 
 namespace {
 
 const int kRightColumnWidth = 210;
 const int kIconSize = 69;
 
 class ExtensionUninstallDialogDelegateView;
 
+// TODO(estade): remove this when UseNewStyle() is the default.
+int HorizontalMargin() {
+  return views::DialogDelegate::UseNewStyle() ? views::kButtonHEdgeMarginNew :
+                                                views::kPanelHorizMargin;
+}
+
 // Returns parent window for extension uninstall dialog.
 // For ash, use app list window if it is visible.
 // For other platforms or when app list is not visible on ash,
 // use the given browser window.
 // Note this function could return NULL if ash app list is not visible and
 // there is no browser window.
 gfx::NativeWindow GetParent(Browser* browser) {
 #if defined(USE_ASH)
   if (ash::Shell::HasInstance()) {
     gfx::NativeWindow app_list = ash::Shell::GetInstance()->GetAppListWindow();
@@ skipping 149 matching lines @@
 bool ExtensionUninstallDialogDelegateView::Cancel() {
   if (dialog_)
     dialog_->ExtensionUninstallCanceled();
   return true;
 }
 
 string16 ExtensionUninstallDialogDelegateView::GetWindowTitle() const {
   return l10n_util::GetStringUTF16(IDS_EXTENSION_UNINSTALL_PROMPT_TITLE);
 }
 
-
 gfx::Size ExtensionUninstallDialogDelegateView::GetPreferredSize() {
   int width = kRightColumnWidth;
   width += kIconSize;
-  width += views::kPanelHorizMargin * 3;
+  width += HorizontalMargin() * 2;
+  width += views::kRelatedControlHorizontalSpacing;
 
   int height = views::kPanelVertMargin * 2;
   height += heading_->GetHeightForWidth(kRightColumnWidth);
 
   return gfx::Size(width,
                    std::max(height, kIconSize + views::kPanelVertMargin * 2));
 }
 
 void ExtensionUninstallDialogDelegateView::Layout() {
-  int x = views::kPanelHorizMargin;
+  int x = HorizontalMargin();
   int y = views::kPanelVertMargin;
 
   heading_->SizeToFit(kRightColumnWidth);
 
   if (heading_->height() <= kIconSize) {
     icon_->SetBounds(x, y, kIconSize, kIconSize);
     x += kIconSize;
-    x += views::kPanelHorizMargin;
+    x += views::kRelatedControlHorizontalSpacing;
 
     heading_->SetX(x);
     heading_->SetY(y + (kIconSize - heading_->height()) / 2);
   } else {
     icon_->SetBounds(x,
                      y + (heading_->height() - kIconSize) / 2,
                      kIconSize,
                      kIconSize);
     x += kIconSize;
-    x += views::kPanelHorizMargin;
+    x += views::kRelatedControlHorizontalSpacing;
 
     heading_->SetX(x);
     heading_->SetY(y);
   }
 }
 
 }  // namespace
 
 // static
 ExtensionUninstallDialog* ExtensionUninstallDialog::Create(
     Profile* profile,
     Browser* browser,
     Delegate* delegate) {
   return new ExtensionUninstallDialogViews(profile, browser, delegate);
 }