Fix badge display for extension action overflow menu

chrome/browser/ui/views/toolbar/browser_actions_container.cc

 // Copyright 2013 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/browser/ui/views/toolbar/browser_actions_container.h"
 
 #include "base/compiler_specific.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 40 matching lines @@
 
 namespace {
 
 // Horizontal spacing between most items in the container, as well as after the
 // last item or chevron (if visible).
 const int kItemSpacing = ToolbarView::kStandardSpacing;
 
 // Horizontal spacing before the chevron (if visible).
 const int kChevronSpacing = kItemSpacing - 2;
 
-// Padding to make sure the badge appears in the right location vertically when
-// in overflow mode (inside the Chrome menu).
-// TODO(devlin): Remove this hard coding and make sure the badge appears
-//               correctly.
-const int kPaddingForBadge = 9;
-
 // The maximum number of icons to show per row when in overflow mode (showing
 // icons in the application menu).
 // TODO(devlin): Compute the right number of icons to show, depending on the
 //               menu width.
 #if defined(OS_LINUX)
 const int kIconsPerMenuRow = 8;  // The menu on Linux is wider.
 #else
 const int kIconsPerMenuRow = 7;
 #endif
 
@@ skipping 273 matching lines @@
     }
 
     for (size_t i = main_container_->VisibleBrowserActionsAfterAnimation();
          i < browser_action_views_.size(); ++i) {
       BrowserActionView* view = browser_action_views_[i];
       size_t index = i - main_container_->VisibleBrowserActionsAfterAnimation();
       int row_index = static_cast<int>(index) / kIconsPerMenuRow;
       int x = (index * IconWidth(true)) -
           (row_index * IconWidth(true) * kIconsPerMenuRow);
       gfx::Rect rect_bounds(
-          x,
-          IconHeight() * row_index,
-          icon_width,
-          IconHeight() + kPaddingForBadge);
+          x, IconHeight() * row_index, icon_width, IconHeight());
       view->SetBoundsRect(rect_bounds);
       view->SetVisible(true);
     }
   } else {
     for (BrowserActionViews::const_iterator it = browser_action_views_.begin();
          it < browser_action_views_.end(); ++it) {
       BrowserActionView* view = *it;
       int x = ToolbarView::kStandardSpacing +
           ((it - browser_action_views_.begin()) * IconWidth(true));
       view->SetVisible(x + icon_width <= max_x);
@@ skipping 679 matching lines @@
                                      views::BubbleBorder::TOP_RIGHT,
                                      show_action);
   popup_->GetWidget()->AddObserver(this);
   popup_button_ = button;
 
   // Only set button as pushed if it was triggered by a user click.
   if (should_grant)
     popup_button_->SetButtonPushed();
   return true;
 }