[Mac] Implement the update available notification in the wrench menu.

chrome/browser/cocoa/toolbar_controller.mm

 // 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.
 
 #import "chrome/browser/cocoa/toolbar_controller.h"
 
 #include <algorithm>
 
 #include "app/l10n_util_mac.h"
 #include "app/menus/accelerator_cocoa.h"
 #include "app/menus/menu_model.h"
 #include "base/keyboard_codes.h"
 #include "base/mac_util.h"
 #include "base/nsimage_cache_mac.h"
 #include "base/singleton.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/browser/browser.h"
+#include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/browser_window.h"
 #import "chrome/browser/cocoa/accelerators_cocoa.h"
 #import "chrome/browser/cocoa/back_forward_menu_controller.h"
 #import "chrome/browser/cocoa/background_gradient_view.h"
 #import "chrome/browser/cocoa/encoding_menu_controller_delegate_mac.h"
 #import "chrome/browser/cocoa/extensions/browser_action_button.h"
 #import "chrome/browser/cocoa/extensions/browser_actions_container_view.h"
 #import "chrome/browser/cocoa/extensions/browser_actions_controller.h"
 #import "chrome/browser/cocoa/gradient_button_cell.h"
 #import "chrome/browser/cocoa/location_bar/autocomplete_text_field_editor.h"
 #import "chrome/browser/cocoa/location_bar/location_bar_view_mac.h"
 #import "chrome/browser/cocoa/menu_button.h"
 #import "chrome/browser/cocoa/menu_controller.h"
 #import "chrome/browser/cocoa/reload_button.h"
 #import "chrome/browser/cocoa/toolbar_view.h"
 #import "chrome/browser/cocoa/wrench_menu_controller.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/toolbar_model.h"
+#include "chrome/browser/upgrade_detector.h"
 #include "chrome/browser/wrench_menu_model.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_observer.h"
+#include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 #include "gfx/rect.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
 
 namespace {
 
 // Names of images in the bundle for buttons.
 NSString* const kBackButtonImageName = @"back_Template.pdf";
 NSString* const kForwardButtonImageName = @"forward_Template.pdf";
 NSString* const kReloadButtonReloadImageName = @"reload_Template.pdf";
 NSString* const kReloadButtonStopImageName = @"stop_Template.pdf";
 NSString* const kHomeButtonImageName = @"home_Template.pdf";
 NSString* const kWrenchButtonImageName = @"menu_chrome_Template.pdf";
@@ skipping 15 matching lines @@
 - (void)prefChanged:(std::wstring*)prefName;
 - (BackgroundGradientView*)backgroundGradientView;
 - (void)toolbarFrameChanged;
 - (void)pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:(BOOL)animate;
 - (void)maintainMinimumLocationBarWidth;
 - (void)adjustBrowserActionsContainerForNewWindow:(NSNotification*)notification;
 - (void)browserActionsContainerDragged:(NSNotification*)notification;
 - (void)browserActionsContainerDragFinished:(NSNotification*)notification;
 - (void)browserActionsVisibilityChanged:(NSNotification*)notification;
 - (void)adjustLocationSizeBy:(CGFloat)dX animate:(BOOL)animate;
+- (void)badgeWrenchMenu;
 @end
 
 namespace ToolbarControllerInternal {
 
 // A C++ delegate that handles enabling/disabling menu items and handling when
 // a menu command is chosen.
 class MenuDelegate : public menus::SimpleMenuModel::Delegate {
  public:
   explicit MenuDelegate(Browser* browser)
       : browser_(browser) { }
@@ skipping 39 matching lines @@
         string_id = IDS_EXIT_FULLSCREEN_MAC;
       return l10n_util::GetStringUTF16(string_id);
     }
     return menus::SimpleMenuModel::Delegate::GetLabelForCommandId(command_id);
   }
 
  private:
   Browser* browser_;
 };
 
-// A C++ class registered for changes in preferences. Bridges the
-// notification back to the ToolbarController.
-class PrefObserverBridge : public NotificationObserver {
+// A class registered for C++ notifications. This is used to detect changes in
+// preferences and upgrade available notifications. Bridges the notification
+// back to the ToolbarController.
+class NotificationBridge : public NotificationObserver {
  public:
-  explicit PrefObserverBridge(ToolbarController* controller)
-      : controller_(controller) { }
+  explicit NotificationBridge(ToolbarController* controller)
+      : controller_(controller) {
+    registrar_.Add(this, NotificationType::UPGRADE_RECOMMENDED,
+                   NotificationService::AllSources());
+  }
+
   // Overridden from NotificationObserver:
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details) {
     if (type == NotificationType::PREF_CHANGED)
       [controller_ prefChanged:Details<std::wstring>(details).ptr()];
+    else if (type == NotificationType::UPGRADE_RECOMMENDED)
+      [controller_ badgeWrenchMenu];
   }
+
  private:
   ToolbarController* controller_;  // weak, owns us
+
+  NotificationRegistrar registrar_;
 };
 
 }  // namespace ToolbarControllerInternal
 
 @implementation ToolbarController
 
 - (id)initWithModel:(ToolbarModel*)model
            commands:(CommandUpdater*)commands
             profile:(Profile*)profile
             browser:(Browser*)browser
@@ skipping 56 matching lines @@
 - (void)awakeFromNib {
   // A bug in AppKit (<rdar://7298597>, <http://openradar.me/7298597>) causes
   // images loaded directly from nibs in a framework to not get their "template"
   // flags set properly. Thus, despite the images being set on the buttons in
   // the xib, we must set them in code.
   [backButton_ setImage:nsimage_cache::ImageNamed(kBackButtonImageName)];
   [forwardButton_ setImage:nsimage_cache::ImageNamed(kForwardButtonImageName)];
   [reloadButton_
       setImage:nsimage_cache::ImageNamed(kReloadButtonReloadImageName)];
   [homeButton_ setImage:nsimage_cache::ImageNamed(kHomeButtonImageName)];
-  [wrenchButton_ setImage:nsimage_cache::ImageNamed(kWrenchButtonImageName)];
+
+  if (Singleton<UpgradeDetector>::get()->notify_upgrade()) {
+    [self badgeWrenchMenu];
+  } else {
+    NSImage* wrenchImage = nsimage_cache::ImageNamed(kWrenchButtonImageName);
+    [wrenchButton_ setImage:wrenchImage];
+  }
 
   [backButton_ setShowsBorderOnlyWhileMouseInside:YES];
   [forwardButton_ setShowsBorderOnlyWhileMouseInside:YES];
   [reloadButton_ setShowsBorderOnlyWhileMouseInside:YES];
   [homeButton_ setShowsBorderOnlyWhileMouseInside:YES];
   [wrenchButton_ setShowsBorderOnlyWhileMouseInside:YES];
 
   [self initCommandStatus:commands_];
   locationBarView_.reset(new LocationBarViewMac(locationBar_,
                                                 commands_, toolbarModel_,
                                                 profile_, browser_));
   [locationBar_ setFont:[NSFont systemFontOfSize:[NSFont systemFontSize]]];
   // Register pref observers for the optional home and page/options buttons
   // and then add them to the toolbar based on those prefs.
-  prefObserver_.reset(new ToolbarControllerInternal::PrefObserverBridge(self));
+  notificationBridge_.reset(
+      new ToolbarControllerInternal::NotificationBridge(self));
   PrefService* prefs = profile_->GetPrefs();
-  showHomeButton_.Init(prefs::kShowHomeButton, prefs, prefObserver_.get());
+  showHomeButton_.Init(prefs::kShowHomeButton, prefs,
+                       notificationBridge_.get());
   showPageOptionButtons_.Init(prefs::kShowPageOptionsButtons, prefs,
-                              prefObserver_.get());
+                              notificationBridge_.get());
   [self showOptionalHomeButton];
   [self installWrenchMenu];
 
   // Create the controllers for the back/forward menus.
   backMenuController_.reset([[BackForwardMenuController alloc]
           initWithBrowser:browser_
                 modelType:BACK_FORWARD_MENU_TYPE_BACK
                    button:backButton_]);
   forwardMenuController_.reset([[BackForwardMenuController alloc]
           initWithBrowser:browser_
@@ skipping 250 matching lines @@
   wrenchMenuModel_.reset(new WrenchMenuModel(menuDelegate_.get(), browser_));
   [wrenchMenuController_ setModel:wrenchMenuModel_.get()];
   [wrenchMenuController_ setUseWithPopUpButtonCell:YES];
   [wrenchButton_ setAttachedMenu:[wrenchMenuController_ menu]];
 }
 
 - (WrenchMenuController*)wrenchMenuController {
   return wrenchMenuController_;
 }
 
+- (void)badgeWrenchMenu {
+  // The wrench menu gets an upgrade dot. Currently, it's ugly.
+  // http://crbug.com/49370
+  NSImage* wrenchImage = nsimage_cache::ImageNamed(kWrenchButtonImageName);
+  ThemeProvider* theme_provider = profile_->GetThemeProvider();
+  NSImage* badge = theme_provider->GetNSImageNamed(IDR_UPGRADE_DOT_ACTIVE,
+                                                   true);
+  [wrenchImage lockFocus];
+  [badge drawAtPoint:NSMakePoint(1, 1)
+            fromRect:NSZeroRect
+           operation:NSCompositeSourceOver
+            fraction:1.0];
+  [wrenchImage unlockFocus];
+  [wrenchButton_ setImage:wrenchImage];
+  [wrenchButton_ setNeedsDisplay:YES];
+}
+
 - (void)prefChanged:(std::wstring*)prefName {
   if (!prefName) return;
   if (*prefName == prefs::kShowHomeButton) {
     [self showOptionalHomeButton];
   }
 }
 
 - (void)createBrowserActionButtons {
   if (!browserActionsController_.get()) {
     browserActionsController_.reset([[BrowserActionsController alloc]
@@ skipping 198 matching lines @@
 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point {
   // Do nothing.
 }
 
 // (URLDropTargetController protocol)
 - (void)hideDropURLsIndicatorInView:(NSView*)view {
   // Do nothing.
 }
 
 @end