Update the icons for the upgrade notification and the conflicts detected page...

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 "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/accessibility/browser_accessibility_state.h"
@@ skipping 164 matching lines @@
   app_menu_ = new views::MenuButton(NULL, std::wstring(), this, false);
   app_menu_->set_border(NULL);
   app_menu_->EnableCanvasFlippingForRTLUI(true);
   app_menu_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_APP));
   app_menu_->SetTooltipText(l10n_util::GetStringF(IDS_APPMENU_TOOLTIP,
       l10n_util::GetString(IDS_PRODUCT_NAME)));
   app_menu_->SetID(VIEW_ID_APP_MENU);
 
   // Catch the case where the window is created after we detect a new version.
   if (IsUpgradeRecommended() || ShouldShowIncompatibilityWarning())
-    ShowNotificationDot();
+    UpdateAppMenuBadge();
 
   LoadImages();
 
   // Always add children in order from left to right, for accessibility.
   AddChildView(back_);
   AddChildView(forward_);
   AddChildView(reload_);
   AddChildView(home_);
   AddChildView(location_bar_);
   AddChildView(browser_actions_);
@@ skipping 119 matching lines @@
     menu_listeners_[i]->OnMenuOpened();
 
   wrench_menu_->RunMenu(app_menu_);
 
 #if defined(OS_CHROMEOS)
 cleanup:
 #endif
   if (destroyed_flag)
     return;
   destroyed_flag_ = NULL;
-
-  // Stop pulsating the notification dot on the app menu (if active).
-  notification_dot_pulse_timer_.Stop();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, LocationBarView::Delegate implementation:
 
 TabContents* ToolbarView::GetTabContents() {
   return browser_->GetSelectedTabContents();
 }
 
 InstantController* ToolbarView::GetInstant() {
   return browser_->instant();
 }
 
 void ToolbarView::OnInputInProgress(bool in_progress) {
   // The edit should make sure we're only notified when something changes.
   DCHECK(model_->input_in_progress() != in_progress);
 
   model_->set_input_in_progress(in_progress);
   location_bar_->Update(NULL);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// ToolbarView, AnimationDelegate implementation:
-
-void ToolbarView::AnimationProgressed(const Animation* animation) {
-  app_menu_->SetIcon(GetAppMenuIcon(views::CustomButton::BS_NORMAL));
-  app_menu_->SetHoverIcon(GetAppMenuIcon(views::CustomButton::BS_HOT));
-  app_menu_->SetPushedIcon(GetAppMenuIcon(views::CustomButton::BS_PUSHED));
-  SchedulePaint();
-}
-
-////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, CommandUpdater::CommandObserver implementation:
 
 void ToolbarView::EnabledStateChangedForCommand(int id, bool enabled) {
   views::Button* button = NULL;
   switch (id) {
     case IDC_BACK:
       button = back_;
       break;
     case IDC_FORWARD:
       button = forward_;
@@ skipping 30 matching lines @@
 void ToolbarView::Observe(NotificationType type,
                           const NotificationSource& source,
                           const NotificationDetails& details) {
   if (type == NotificationType::PREF_CHANGED) {
     std::string* pref_name = Details<std::string>(details).ptr();
     if (*pref_name == prefs::kShowHomeButton) {
       Layout();
       SchedulePaint();
     }
   } else if (type == NotificationType::UPGRADE_RECOMMENDED) {
-    ShowNotificationDot();
+    UpdateAppMenuBadge();
   } else if (type == NotificationType::MODULE_INCOMPATIBILITY_DETECTED) {
     bool confirmed_bad = *Details<bool>(details).ptr();
     if (confirmed_bad)
-      ShowNotificationDot();
+      UpdateAppMenuBadge();
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, menus::AcceleratorProvider implementation:
 
 bool ToolbarView::GetAcceleratorForCommandId(int command_id,
     menus::Accelerator* accelerator) {
   // The standard Ctrl-X, Ctrl-V and Ctrl-C are not defined as accelerators
   // anywhere so we need to check for them explicitly here.
@@ skipping 216 matching lines @@
   home_->SetImage(views::CustomButton::BS_NORMAL, tp->GetBitmapNamed(IDR_HOME));
   home_->SetImage(views::CustomButton::BS_HOT, tp->GetBitmapNamed(IDR_HOME_H));
   home_->SetImage(views::CustomButton::BS_PUSHED,
       tp->GetBitmapNamed(IDR_HOME_P));
 
   app_menu_->SetIcon(GetAppMenuIcon(views::CustomButton::BS_NORMAL));
   app_menu_->SetHoverIcon(GetAppMenuIcon(views::CustomButton::BS_HOT));
   app_menu_->SetPushedIcon(GetAppMenuIcon(views::CustomButton::BS_PUSHED));
 }
 
-void ToolbarView::ShowNotificationDot() {
-  notification_dot_animation_.reset(new SlideAnimation(this));
-  notification_dot_animation_->SetSlideDuration(kPulseDuration);
-
-  // Then start the recurring timer for pulsating it.
-  notification_dot_pulse_timer_.Stop();
-  notification_dot_pulse_timer_.Start(
-      base::TimeDelta::FromMilliseconds(kPulsateEveryMs),
-      this, &ToolbarView::PulsateNotificationDot);
-}
-
-void ToolbarView::PulsateNotificationDot() {
-  // Start the pulsating animation.
-  notification_dot_animation_->Reset(0.0);
-  notification_dot_animation_->Show();
+void ToolbarView::UpdateAppMenuBadge() {
+  app_menu_->SetIcon(GetAppMenuIcon(views::CustomButton::BS_NORMAL));
+  app_menu_->SetHoverIcon(GetAppMenuIcon(views::CustomButton::BS_HOT));
+  app_menu_->SetPushedIcon(GetAppMenuIcon(views::CustomButton::BS_PUSHED));
+  SchedulePaint();
 }
 
 SkBitmap ToolbarView::GetAppMenuIcon(views::CustomButton::ButtonState state) {
   ThemeProvider* tp = GetThemeProvider();
 
   int id = 0;
   switch (state) {
     case views::CustomButton::BS_NORMAL: id = IDR_TOOLS;   break;
     case views::CustomButton::BS_HOT:    id = IDR_TOOLS_H; break;
     case views::CustomButton::BS_PUSHED: id = IDR_TOOLS_P; break;
     default:                             NOTREACHED();     break;
   }
   SkBitmap icon = *tp->GetBitmapNamed(id);
 
   bool add_badge = IsUpgradeRecommended() || ShouldShowIncompatibilityWarning();
   if (!add_badge)
     return icon;
 
   // Draw the chrome app menu icon onto the canvas.
   scoped_ptr<gfx::CanvasSkia> canvas(
       new gfx::CanvasSkia(icon.width(), icon.height(), false));
   canvas->DrawBitmapInt(icon, 0, 0);
 
-  SkBitmap badge;
-  static bool has_faded_in = false;
-  if (!has_faded_in) {
-    SkBitmap* dot = NULL;
-    if (ShouldShowIncompatibilityWarning()) {
+  SkBitmap* badge = NULL;
+  // Only one badge can be active at any given time. The Upgrade notification
+  // is deemed most important, then the DLL conflict badge.
+  if (IsUpgradeRecommended()) {
+    badge = tp->GetBitmapNamed(IDR_UPDATE_BADGE);
+  } else if (ShouldShowIncompatibilityWarning()) {
 #if defined(OS_WIN)
-      dot = tp->GetBitmapNamed(IDR_INCOMPATIBILITY_DOT_INACTIVE);
+    badge = tp->GetBitmapNamed(IDR_CONFLICT_BADGE);
 #else
-      NOTREACHED();
+    NOTREACHED();
 #endif
-    } else {
-      dot = tp->GetBitmapNamed(IDR_UPGRADE_DOT_INACTIVE);
-    }
-    SkBitmap transparent;
-    transparent.setConfig(dot->getConfig(), dot->width(), dot->height());
-    transparent.allocPixels();
-    transparent.eraseARGB(0, 0, 0, 0);
-    badge = SkBitmapOperations::CreateBlendedBitmap(
-        *dot, transparent,
-        1.0 - notification_dot_animation_->GetCurrentValue());
-    if (notification_dot_animation_->GetCurrentValue() == 1.0)
-      has_faded_in = true;
   } else {
-    // Convert animation values that start from 0.0 and incrementally go
-    // up to 1.0 into values that start in 0.0, go to 1.0 and then back
-    // to 0.0 (to create a pulsing effect).
-    double value =
-        1.0 - abs(2.0 * notification_dot_animation_->GetCurrentValue() - 1.0);
-
-    // Add the badge to it.
-    if (ShouldShowIncompatibilityWarning()) {
-#if defined(OS_WIN)
-      badge = SkBitmapOperations::CreateBlendedBitmap(
-          *tp->GetBitmapNamed(IDR_INCOMPATIBILITY_DOT_INACTIVE),
-          *tp->GetBitmapNamed(IDR_INCOMPATIBILITY_DOT_ACTIVE),
-          value);
-#else
-      NOTREACHED();
-#endif
-    } else {
-      badge = SkBitmapOperations::CreateBlendedBitmap(
-          *tp->GetBitmapNamed(IDR_UPGRADE_DOT_INACTIVE),
-          *tp->GetBitmapNamed(IDR_UPGRADE_DOT_ACTIVE),
-          value);
-    }
+    NOTREACHED();
   }
 
-  static const int kBadgeLeftSpacing = 8;
-  static const int kBadgeTopSpacing = 18;
-  canvas->DrawBitmapInt(badge, kBadgeLeftSpacing, kBadgeTopSpacing);
+  static const int kBadgeRightMargin = 2;
+  static const int kBadgeTopMargin = 2;
+  canvas->DrawBitmapInt(*badge,
+                        icon.width() - badge->width() - kBadgeRightMargin,
+                        0 + kBadgeTopMargin);

[Andrew T Wilson (Slow), 2010/11/17 03:31:32]

This is a nice refactoring - the code is much cleaner now (I've made changes to
this routine locally and I was dreading doing the merge, but it should be really
simple the way you've done this). one nit - not sure why the y position is "0 +
kBadgeTopMargin" instead of just kBadgeTopMargin. Is this supposed to connote
something special?

[Finnur, 2010/11/17 09:18:51]

Yes, that I'm an idiot. :)

 
   return canvas->ExtractBitmap();
 }