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

ui/views/controls/button/text_button.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 "ui/views/controls/button/text_button.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
@@ skipping 712 matching lines @@
 
 void TextButton::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {
   TextButtonBase::PaintButton(canvas, mode);
 
   const gfx::ImageSkia& icon = GetImageToPaint();
 
   if (icon.width() > 0) {
     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 {
+    } else if (icon_placement_ == ICON_ON_RIGHT) {
       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();
 
     // Mirroring the icon position if necessary.
     gfx::Rect icon_bounds(icon_x, icon_y, icon.width(), icon.height());
     icon_bounds.set_x(GetMirroredXForRect(icon_bounds));
     canvas->DrawImageInt(icon, icon_bounds.x(), icon_bounds.y());
   }
 }
 
@@ skipping 28 matching lines @@
   const gfx::ImageSkia& icon = GetImageToPaint();
   if (icon.width() > 0)
     extra_width = icon.width() + (text_.empty() ? 0 : icon_text_spacing_);
 
   gfx::Rect bounds(GetContentBounds(extra_width));
 
   if (extra_width > 0) {
     // Make sure the icon is always fully visible.
     if (icon_placement_ == ICON_ON_LEFT) {
       bounds.Inset(extra_width, 0, 0, 0);
-    } else {
+    } else if (icon_placement_ == ICON_ON_RIGHT) {
       bounds.Inset(0, 0, extra_width, 0);
     }
   }
 
   return bounds;
 }
 
 const gfx::ImageSkia& TextButton::GetImageToPaint() const {
   if (show_multiple_icon_states_) {
     if (has_hover_icon_ && (state() == BS_HOT))
@@ skipping 64 matching lines @@
   // Windows may paint a dotted focus rect in
   // NativeTextButton::OnPaintFocusBorder. To avoid getting two focus
   // indications (A dotted rect and a highlighted border) only set is_focused on
   // non windows platforms.
   params->button.is_focused = HasFocus() &&
       (focusable() || IsAccessibilityFocusable());
 #endif
 }
 
 }  // namespace views