Change SimpleMenuModel on OSX to support dynamic icons

chrome/browser/ui/toolbar/wrench_menu_model.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/ui/toolbar/wrench_menu_model.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "app/l10n_util.h"
@@ skipping 203 matching lines @@
       tabstrip_model_(browser_->tabstrip_model()) {
   Build();
   UpdateZoomControls();
 
   tabstrip_model_->AddObserver(this);
 
   registrar_.Add(this, NotificationType::ZOOM_LEVEL_CHANGED,
                  Source<Profile>(browser_->profile()));
   registrar_.Add(this, NotificationType::NAV_ENTRY_COMMITTED,
                  NotificationService::AllSources());
-  registrar_.Add(this,
-                 NotificationType::BACKGROUND_PAGE_TRACKER_CHANGED,
-                 NotificationService::AllSources());
 }
 
 WrenchMenuModel::~WrenchMenuModel() {
   if (tabstrip_model_)
     tabstrip_model_->RemoveObserver(this);
 }
 
 bool WrenchMenuModel::DoesCommandIdDismissMenu(int command_id) const {
   return command_id != IDC_ZOOM_MINUS && command_id != IDC_ZOOM_PLUS;
 }
 
-bool WrenchMenuModel::IsLabelForCommandIdDynamic(int command_id) const {
+bool WrenchMenuModel::IsItemForCommandIdDynamic(int command_id) const {
   return command_id == IDC_ZOOM_PERCENT_DISPLAY ||
 #if defined(OS_MACOSX)
          command_id == IDC_FULLSCREEN ||
 #endif
          command_id == IDC_SYNC_BOOKMARKS ||
          command_id == IDC_VIEW_BACKGROUND_PAGES;
 }
 
+bool WrenchMenuModel::GetIconForCommandId(int command_id,
+                                          SkBitmap* bitmap) const {
+  switch (command_id) {
+    case IDC_VIEW_BACKGROUND_PAGES: {
+      int num_pages = BackgroundPageTracker::GetSingleton()->
+          GetUnacknowledgedBackgroundPageCount();
+      if (num_pages > 0) {
+        *bitmap = GetBackgroundPageIcon();
+        return true;
+      } else {
+        // No icon.
+        return false;
+      }
+    }
+    default:
+      // No icon for other dynamic menu items.
+      return false;
+  }
+}
+
 string16 WrenchMenuModel::GetLabelForCommandId(int command_id) const {
   switch (command_id) {
     case IDC_SYNC_BOOKMARKS:
       return GetSyncMenuLabel();
     case IDC_ZOOM_PERCENT_DISPLAY:
       return zoom_label_;
 #if defined(OS_MACOSX)
     case IDC_FULLSCREEN: {
       int string_id = IDS_ENTER_FULLSCREEN_MAC;  // Default to Enter.
       // Note: On startup, |window()| may be NULL.
@@ skipping 86 matching lines @@
   // During views shutdown, the tabstrip model/browser is deleted first, while
   // it is the opposite in gtk land.
   tabstrip_model_->RemoveObserver(this);
   tabstrip_model_ = NULL;
 }
 
 void WrenchMenuModel::Observe(NotificationType type,
                               const NotificationSource& source,
                               const NotificationDetails& details) {
   switch (type.value) {
-    case NotificationType::BACKGROUND_PAGE_TRACKER_CHANGED: {
-      int num_pages = BackgroundPageTracker::GetSingleton()->
-          GetUnacknowledgedBackgroundPageCount();
-      if (num_pages > 0) {
-        SetIcon(GetIndexOfCommandId(IDC_VIEW_BACKGROUND_PAGES),
-                GetBackgroundPageIcon());
-      } else {
-        // Just set a blank icon (no icon).
-        SetIcon(GetIndexOfCommandId(IDC_VIEW_BACKGROUND_PAGES), SkBitmap());
-      }
-      break;
-    }
     case NotificationType::ZOOM_LEVEL_CHANGED:
     case NotificationType::NAV_ENTRY_COMMITTED:
       UpdateZoomControls();
       break;
     default:
       NOTREACHED();
   }
 }
 
 // For testing.
@@ skipping 100 matching lines @@
       IDS_VIEW_INCOMPATIBILITIES));
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   SetIcon(GetIndexOfCommandId(IDC_UPGRADE_DIALOG),
           *rb.GetBitmapNamed(IDR_UPDATE_MENU));
 #if defined(OS_WIN)
   SetIcon(GetIndexOfCommandId(IDC_VIEW_INCOMPATIBILITIES),
           *rb.GetBitmapNamed(IDR_CONFLICT_MENU));
 #endif
 
-  // Add an icon to the View Background Pages item if there are unacknowledged
-  // pages.
-  if (BackgroundPageTracker::GetSingleton()->
-      GetUnacknowledgedBackgroundPageCount() > 0) {
-    SetIcon(GetIndexOfCommandId(IDC_VIEW_BACKGROUND_PAGES),
-            GetBackgroundPageIcon());
-  }
-
   AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE);
   if (browser_defaults::kShowExitMenuItem) {
     AddSeparator();
 #if defined(OS_CHROMEOS)
     if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession)) {
       AddItemWithStringId(IDC_EXIT, IDS_EXIT_GUEST_MODE);
     } else {
       AddItemWithStringId(IDC_EXIT, IDS_SIGN_OUT);
     }
 #else
@@ skipping 27 matching lines @@
         &enable_increment, &enable_decrement);
   }
   zoom_label_ = l10n_util::GetStringFUTF16(
       IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));
 }
 
 string16 WrenchMenuModel::GetSyncMenuLabel() const {
   return sync_ui_util::GetSyncMenuLabel(
       browser_->profile()->GetOriginalProfile()->GetProfileSyncService());
 }