Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3482)

Unified Diff: chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc

Issue 63343004: Remove DialogDelegate::UseNewStyle and unused code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Additional cleanup; sync and rebase. Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc
diff --git a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc
index c51023a5bc86609364a4038611aacdf20e388043..e6e4566e53061723a656250554f665e00ab0e160 100644
--- a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc
+++ b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc
@@ -35,12 +35,6 @@ 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())
@@ -205,7 +199,7 @@ string16 ExtensionUninstallDialogDelegateView::GetWindowTitle() const {
gfx::Size ExtensionUninstallDialogDelegateView::GetPreferredSize() {
int width = kRightColumnWidth;
width += kIconSize;
- width += HorizontalMargin() * 2;
+ width += views::kButtonHEdgeMarginNew * 2;
width += views::kRelatedControlHorizontalSpacing;
int height = views::kPanelVertMargin * 2;
@@ -216,7 +210,7 @@ gfx::Size ExtensionUninstallDialogDelegateView::GetPreferredSize() {
}
void ExtensionUninstallDialogDelegateView::Layout() {
- int x = HorizontalMargin();
+ int x = views::kButtonHEdgeMarginNew;
int y = views::kPanelVertMargin;
heading_->SizeToFit(kRightColumnWidth);

Powered by Google App Engine
This is Rietveld 408576698