Revert 156599 - Fixed position of plus image on action box button; added ICON_CENTERED placement to TextButton

BUG=147330


Review URL: https://chromiumcodereview.appspot.com/10933049

TBR=yefim@chromium.org

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156600 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 10 deletions

diff --git a/ui/views/controls/button/text_button.cc b/ui/views/controls/button/text_button.cc
index 93644c3..1a4c4e7 100644
--- a/ui/views/controls/button/text_button.cc
+++ b/ui/views/controls/button/text_button.cc
@@ -730,16 +730,13 @@ void TextButton::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {
     gfx::Rect text_bounds = GetTextBounds();
     int icon_x;
     int spacing = text_.empty() ? 0 : icon_text_spacing_;
-    gfx::Insets insets = GetInsets();
     if (icon_placement_ == ICON_ON_LEFT) {
       icon_x = text_bounds.x() - icon.width() - spacing;
-    } else if (icon_placement_ == ICON_ON_RIGHT) {
+    } else {
       icon_x = text_bounds.right() + spacing;
-    } else {  // ICON_CENTERED
-      DCHECK(text_.empty());
-      icon_x = (width() - insets.width() - icon.width()) / 2 + insets.left();
     }
 
+    gfx::Insets insets = GetInsets();
     int available_height = height() - insets.height();
     int icon_y = (available_height - icon.height()) / 2 + insets.top();
 
@@ -788,7 +785,7 @@ gfx::Rect TextButton::GetTextBounds() const {
     // Make sure the icon is always fully visible.
     if (icon_placement_ == ICON_ON_LEFT) {
       bounds.Inset(extra_width, 0, 0, 0);
-    } else if (icon_placement_ == ICON_ON_RIGHT) {
+    } else {
       bounds.Inset(0, 0, extra_width, 0);
     }
   }
diff --git a/ui/views/controls/button/text_button.h b/ui/views/controls/button/text_button.h
index 233d791..99feea6 100644
--- a/ui/views/controls/button/text_button.h
+++ b/ui/views/controls/button/text_button.h
@@ -328,14 +328,11 @@ class VIEWS_EXPORT TextButton : public TextButtonBase {
   // Meanings are reversed for right-to-left layouts.
   enum IconPlacement {
     ICON_ON_LEFT,
-    ICON_ON_RIGHT,
-    ICON_CENTERED  // Centered is valid only when text is empty.
+    ICON_ON_RIGHT
   };
 
   IconPlacement icon_placement() { return icon_placement_; }
   void set_icon_placement(IconPlacement icon_placement) {
-    // ICON_CENTERED works only when |text_| is empty.
-    DCHECK((icon_placement != ICON_CENTERED) || text_.empty());
     icon_placement_ = icon_placement;
   }