diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-24 16:24:13 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-25 14:13:32 +0100 |
| commit | 3f50c38dc070f4bb515c1b64450dae14f316474e (patch) | |
| tree | 29f309f9534e05c47244eedb438fc612578d133b /chrome/browser/ui/toolbar/wrench_menu_model.cc | |
| parent | e23bef148f7be2bdf9c3cb2cd3aa5ceebf1190fb (diff) | |
| download | external_chromium-3f50c38dc070f4bb515c1b64450dae14f316474e.zip external_chromium-3f50c38dc070f4bb515c1b64450dae14f316474e.tar.gz external_chromium-3f50c38dc070f4bb515c1b64450dae14f316474e.tar.bz2 | |
Merge Chromium at r10.0.634.0: Initial merge by git.
Change-Id: Iac2af492818d119bcc2562eb5fdabf5ab0b6df9c
Diffstat (limited to 'chrome/browser/ui/toolbar/wrench_menu_model.cc')
| -rw-r--r-- | chrome/browser/ui/toolbar/wrench_menu_model.cc | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc index cd8a114..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. @@ -435,12 +419,6 @@ void WrenchMenuModel::Build() { tools_menu_model_.get()); AddSeparator(); -#if defined(ENABLE_REMOTING) - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableRemoting)) { - AddItem(IDC_REMOTING_SETUP, - l10n_util::GetStringUTF16(IDS_REMOTING_SETUP_LABEL)); - } -#endif AddItemWithStringId(IDC_SHOW_BOOKMARK_MANAGER, IDS_BOOKMARK_MANAGER); AddItemWithStringId(IDC_SHOW_HISTORY, IDS_SHOW_HISTORY); AddItemWithStringId(IDC_SHOW_DOWNLOADS, IDS_SHOW_DOWNLOADS); |