Adjust the position of the Wrench menu badge....

chrome/browser/ui/views/toolbar_view.cc

 // Copyright (c) 2010 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/views/toolbar_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/i18n/number_formatting.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 58 matching lines @@
 static const int kPulsateEveryMs = 8000;
 
 static const int kPopupTopSpacingNonGlass = 3;
 static const int kPopupBottomSpacingNonGlass = 2;
 static const int kPopupBottomSpacingGlass = 1;
 
 // The size of the font to use in the text overlay for the background page
 // badge.
 static const float kBadgeTextFontSize = 9.0;
 
-// Margins for the wrench menu badges (badge is placed in the upper right
-// corner of the wrench menu with the specified margins).
-static const int kBadgeRightMargin = 2;
+// Top margin for the wrench menu badges (badge is placed in the upper right
+// corner of the wrench menu).
 static const int kBadgeTopMargin = 2;
 
 static SkBitmap* kPopupBackgroundEdge = NULL;
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, public:
 
 ToolbarView::ToolbarView(Browser* browser)
     : model_(browser->toolbar_model()),
       back_(NULL),
@@ skipping 654 matching lines @@
   } else if (ShouldShowIncompatibilityWarning()) {
 #if defined(OS_WIN)
     badge = *tp->GetBitmapNamed(IDR_CONFLICT_BADGE);
 #else
     NOTREACHED();
 #endif
   } else {
     NOTREACHED();
   }
 
-  canvas->DrawBitmapInt(badge,
-                        icon.width() - badge.width() - kBadgeRightMargin,
-                        kBadgeTopMargin);
+  canvas->DrawBitmapInt(badge, icon.width() - badge.width(), kBadgeTopMargin);
 
   return canvas->ExtractBitmap();
 }
 
 SkBitmap ToolbarView::GetBackgroundPageBadge() {
   ThemeProvider* tp = GetThemeProvider();
   SkBitmap* badge = tp->GetBitmapNamed(IDR_BACKGROUND_BADGE);
   string16 badge_text = base::FormatNumber(
       BackgroundPageTracker::GetSingleton()->GetBackgroundPageCount());
   return badge_util::DrawBadgeIconOverlay(
       *badge,
       kBadgeTextFontSize,
       badge_text,
       l10n_util::GetStringUTF16(IDS_BACKGROUND_PAGE_BADGE_OVERFLOW));
 }