diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-07 00:42:41 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-07 00:42:41 +0000 |
| commit | 8edf3bb8a0b6b1d61b392dd7612558b9bafed02a (patch) | |
| tree | 06b099df0696d9f9932158f62007fa0c1f79e102 /chrome/browser/ui/toolbar | |
| parent | a6ec0897e904792a60a12a58b26dd2214dbcfa39 (diff) | |
| download | chromium_src-8edf3bb8a0b6b1d61b392dd7612558b9bafed02a.zip chromium_src-8edf3bb8a0b6b1d61b392dd7612558b9bafed02a.tar.gz chromium_src-8edf3bb8a0b6b1d61b392dd7612558b9bafed02a.tar.bz2 | |
Display only static background page badges. New art coming in a separate CL.
BUG=64144
TEST=enable extension with background page, see badge
Review URL: http://codereview.chromium.org/6057008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70689 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/toolbar')
| -rw-r--r-- | chrome/browser/ui/toolbar/wrench_menu_model.cc | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc index e82fb08..a68922f 100644 --- a/chrome/browser/ui/toolbar/wrench_menu_model.cc +++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc @@ -28,7 +28,6 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/toolbar/encoding_menu_controller.h" #include "chrome/browser/upgrade_detector.h" -#include "chrome/common/badge_util.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_source.h" @@ -56,22 +55,6 @@ #include "chrome/browser/enumerate_modules_model_win.h" #endif -// The size of the font used for dynamic text overlays on menu items. -const float kMenuBadgeFontSize = 12.0; - -namespace { -SkBitmap GetBackgroundPageIcon() { - string16 pages = base::FormatNumber( - BackgroundPageTracker::GetInstance()->GetBackgroundPageCount()); - return badge_util::DrawBadgeIconOverlay( - *ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_BACKGROUND_MENU), - kMenuBadgeFontSize, - pages, - l10n_util::GetStringUTF16(IDS_BACKGROUND_PAGE_BADGE_OVERFLOW)); -} - -} // namespace - //////////////////////////////////////////////////////////////////////////////// // EncodingMenuModel @@ -248,7 +231,8 @@ bool WrenchMenuModel::GetIconForCommandId(int command_id, int num_pages = BackgroundPageTracker::GetInstance()-> GetUnacknowledgedBackgroundPageCount(); if (num_pages > 0) { - *bitmap = GetBackgroundPageIcon(); + *bitmap = *ResourceBundle::GetSharedInstance().GetBitmapNamed( + IDR_BACKGROUND_MENU); return true; } else { // No icon. |