summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortbarzic@chromium.org <tbarzic@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-13 21:49:30 +0000
committertbarzic@chromium.org <tbarzic@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-13 21:49:30 +0000
commit5992ca4cbbab99eb2deca0c5a8b862834b5fb819 (patch)
tree7c3298a9f1cd16708fa41f3ee56919f333075950
parent431428fd812889df530809febdb73f4800673fc3 (diff)
downloadchromium_src-5992ca4cbbab99eb2deca0c5a8b862834b5fb819.zip
chromium_src-5992ca4cbbab99eb2deca0c5a8b862834b5fb819.tar.gz
chromium_src-5992ca4cbbab99eb2deca0c5a8b862834b5fb819.tar.bz2
Merge 167018 - Fix extension action badges with long text.
BUG=160069 TEST=manual Review URL: https://codereview.chromium.org/11364185 TBR=tbarzic@chromium.org Review URL: https://codereview.chromium.org/11275294 git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@167480 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/common/extensions/extension_action.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/common/extensions/extension_action.cc b/chrome/common/extensions/extension_action.cc
index e54c255..286bf86 100644
--- a/chrome/common/extensions/extension_action.cc
+++ b/chrome/common/extensions/extension_action.cc
@@ -428,7 +428,7 @@ void ExtensionAction::DoPaintBadge(gfx::Canvas* canvas,
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);