Merge 167018 - Fix extension action badges with long text.

chrome/common/extensions/extension_action.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/common/extensions/extension_action.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 410 matching lines @@
   if (icon_width != 0 && (badge_width % 2 != icon_width % 2))
     badge_width += 1;
   badge_width = std::max(kBadgeHeight, badge_width);
 
   // Paint the badge background color in the right location. It is usually
   // right-aligned, but it can also be center-aligned if it is large.
   int rect_height = kBadgeHeight;
   int rect_y = bounds.bottom() - kBottomMargin - kBadgeHeight;
   int rect_width = badge_width;
   int rect_x = (badge_width >= kCenterAlignThreshold) ?
-      (bounds.x() + bounds.width() - badge_width) / 2 :
+      bounds.x() + (bounds.width() - badge_width) / 2 :
       bounds.right() - badge_width;
   gfx::Rect rect(rect_x, rect_y, rect_width, rect_height);
 
   SkPaint rect_paint;
   rect_paint.setStyle(SkPaint::kFill_Style);
   rect_paint.setAntiAlias(true);
   rect_paint.setColor(background_color);
   canvas->DrawRoundRect(rect, 2, rect_paint);
 
   // Overlay the gradient. It is stretchy, so we do this in three parts.
@@ skipping 71 matching lines @@
   icon_animation->Start();
   // After the icon is finished fading in (plus some padding to handle random
   // timer delays), destroy it. We use a delayed task so that the Animation is
   // deleted even if it hasn't finished by the time the MessageLoop is
   // destroyed.
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&DestroyIconAnimation, base::Passed(icon_animation.Pass())),
       base::TimeDelta::FromMilliseconds(kIconFadeInDurationMs * 2));
 }