Remove DialogDelegate::UseNewStyle and unused code.

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/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 17 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.
 gfx::NativeWindow GetParent(Browser* browser) {
   if (browser && browser->window())
     return browser->window()->GetNativeWindow();
   return NULL;
 }
 
 // Views implementation of the uninstall dialog.
 class ExtensionUninstallDialogViews : public ExtensionUninstallDialog {
  public:
@@ skipping 144 matching lines @@
   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 += HorizontalMargin() * 2;
+  width += views::kButtonHEdgeMarginNew * 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 = HorizontalMargin();
+  int x = views::kButtonHEdgeMarginNew;
   int y = views::kPanelVertMargin;
 
   heading_->SizeToFit(kRightColumnWidth);
 
   if (heading_->height() <= kIconSize) {
     icon_->SetBounds(x, y, kIconSize, kIconSize);
     x += kIconSize;
     x += views::kRelatedControlHorizontalSpacing;
 
     heading_->SetX(x);
@@ skipping 13 matching lines @@
 
 }  // namespace
 
 // static
 ExtensionUninstallDialog* ExtensionUninstallDialog::Create(
     Profile* profile,
     Browser* browser,
     Delegate* delegate) {
   return new ExtensionUninstallDialogViews(profile, browser, delegate);
 }