[gtk] use new update badge on wrench menu

chrome/browser/gtk/browser_toolbar_gtk.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/gtk/browser_toolbar_gtk.h"
 
 #include <X11/XF86keysym.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
@@ skipping 59 matching lines @@
 
 // Interior spacing between toolbar widgets.
 const int kToolbarWidgetSpacing = 1;
 
 // Amount of rounding on top corners of toolbar. Only used in Gtk theme mode.
 const int kToolbarCornerSize = 3;
 
 // The offset in pixels of the upgrade dot on the app menu.
 const int kUpgradeDotOffset = 6;
 
-// The duration of the upgrade notification animation (actually the duration
-// of a half-throb).
-const int kThrobDuration = 1000;
-
 void SetWidgetHeightRequest(GtkWidget* widget, gpointer user_data) {
   gtk_widget_set_size_request(widget, -1, GPOINTER_TO_INT(user_data));
 }
 
 }  // namespace
 
 // BrowserToolbarGtk, public ---------------------------------------------------
 
 BrowserToolbarGtk::BrowserToolbarGtk(Browser* browser, BrowserWindowGtk* window)
     : toolbar_(NULL),
       location_bar_(new LocationBarViewGtk(browser)),
       model_(browser->toolbar_model()),
       wrench_menu_model_(this, browser),
       browser_(browser),
       window_(window),
-      profile_(NULL),
-      upgrade_reminder_animation_(this),
-      upgrade_reminder_canceled_(false) {
+      profile_(NULL) {
   browser_->command_updater()->AddCommandObserver(IDC_BACK, this);
   browser_->command_updater()->AddCommandObserver(IDC_FORWARD, this);
   browser_->command_updater()->AddCommandObserver(IDC_HOME, this);
   browser_->command_updater()->AddCommandObserver(IDC_BOOKMARK_PAGE, this);
 
   registrar_.Add(this,
                  NotificationType::BROWSER_THEME_CHANGED,
                  NotificationService::AllSources());
   registrar_.Add(this,
                  NotificationType::UPGRADE_RECOMMENDED,
                  NotificationService::AllSources());
-
-  upgrade_reminder_animation_.SetThrobDuration(kThrobDuration);
-
-  ActiveWindowWatcherX::AddObserver(this);
 }
 
 BrowserToolbarGtk::~BrowserToolbarGtk() {
-  ActiveWindowWatcherX::RemoveObserver(this);
-
   browser_->command_updater()->RemoveCommandObserver(IDC_BACK, this);
   browser_->command_updater()->RemoveCommandObserver(IDC_FORWARD, this);
   browser_->command_updater()->RemoveCommandObserver(IDC_HOME, this);
   browser_->command_updater()->RemoveCommandObserver(IDC_BOOKMARK_PAGE, this);
 
   offscreen_entry_.Destroy();
 
   wrench_menu_.reset();
 }
 
@@ skipping 90 matching lines @@
 
   // Put the wrench button in a box so that we can paint the update notification
   // over it.
   GtkWidget* wrench_box = gtk_alignment_new(0, 0, 1, 1);
   g_signal_connect_after(wrench_box, "expose-event",
                          G_CALLBACK(OnWrenchMenuButtonExposeThunk), this);
   gtk_container_add(GTK_CONTAINER(wrench_box), wrench_button);
   gtk_box_pack_start(GTK_BOX(toolbar_), wrench_box, FALSE, FALSE, 4);
 
   wrench_menu_.reset(new MenuGtk(this, &wrench_menu_model_));
-  g_signal_connect(wrench_menu_->widget(), "show",
-                   G_CALLBACK(OnWrenchMenuShowThunk), this);
   registrar_.Add(this, NotificationType::ZOOM_LEVEL_CHANGED,
                  Source<Profile>(browser_->profile()));
 
   if (ShouldOnlyShowLocation()) {
     gtk_widget_show(event_box_);
     gtk_widget_show(alignment_);
     gtk_widget_show(toolbar_);
     gtk_widget_show_all(location_hbox_);
     gtk_widget_hide(reload_->widget());
   } else {
     gtk_widget_show_all(event_box_);
     if (actions_toolbar_->button_count() == 0)
       gtk_widget_hide(actions_toolbar_->widget());
   }
   // Initialize pref-dependent UI state.
   NotifyPrefChanged(NULL);
 
   // Because the above does a recursive show all on all widgets we need to
   // update the icon visibility to hide them.
   location_bar_->UpdateContentSettingsIcons();
 
   SetViewIDs();
   theme_provider_->InitThemesFor(this);
-
-  MaybeShowUpgradeReminder();
 }
 
 void BrowserToolbarGtk::SetViewIDs() {
   ViewIDUtil::SetID(widget(), VIEW_ID_TOOLBAR);
   ViewIDUtil::SetID(back_->widget(), VIEW_ID_BACK_BUTTON);
   ViewIDUtil::SetID(forward_->widget(), VIEW_ID_FORWARD_BUTTON);
   ViewIDUtil::SetID(reload_->widget(), VIEW_ID_RELOAD_BUTTON);
   ViewIDUtil::SetID(home_->widget(), VIEW_ID_HOME_BUTTON);
   ViewIDUtil::SetID(location_bar_->widget(), VIEW_ID_LOCATION_BAR);
   ViewIDUtil::SetID(wrench_menu_button_->widget(), VIEW_ID_APP_MENU);
@@ skipping 119 matching lines @@
     if (use_gtk) {
       // We need to manually update the icon if we are in GTK mode. (Note that
       // we set the initial value in Init()).
       gtk_image_set_from_pixbuf(
           GTK_IMAGE(wrench_menu_image_),
           theme_provider_->GetRTLEnabledPixbufNamed(IDR_TOOLS));
     }
 
     UpdateRoundedness();
   } else if (type == NotificationType::UPGRADE_RECOMMENDED) {
-    MaybeShowUpgradeReminder();
+    gtk_widget_queue_draw(wrench_menu_button_->widget());
   } else if (type == NotificationType::ZOOM_LEVEL_CHANGED) {
     // If our zoom level changed, we need to tell the menu to update its state,
     // since the menu could still be open.
     wrench_menu_->UpdateMenu();
   } else {
     NOTREACHED();
   }
 }
 
 // BrowserToolbarGtk, public ---------------------------------------------------
@@ skipping 222 matching lines @@
     }
   }
 
   if (!pref ||
       *pref == prefs::kHomePage ||
       *pref == prefs::kHomePageIsNewTabPage)
     SetUpDragForHomeButton(!home_page_.IsManaged() &&
                            !home_page_is_new_tab_page_.IsManaged());
 }
 
-void BrowserToolbarGtk::MaybeShowUpgradeReminder() {
-  // Only show the upgrade reminder animation for the currently active window.
-  if (window_->IsActive() &&
-      Singleton<UpgradeDetector>::get()->notify_upgrade() &&
-      !upgrade_reminder_canceled_) {
-    upgrade_reminder_animation_.StartThrobbing(-1);
-  } else {
-    upgrade_reminder_animation_.Reset();
-  }
-}
-
 bool BrowserToolbarGtk::ShouldOnlyShowLocation() const {
   // If we're a popup window, only show the location bar (omnibox).
   return browser_->type() != Browser::TYPE_NORMAL;
 }
 
-void BrowserToolbarGtk::AnimationEnded(const Animation* animation) {
-  DCHECK_EQ(animation, &upgrade_reminder_animation_);
-  gtk_widget_queue_draw(wrench_menu_button_->widget()->parent);
-}
-
-void BrowserToolbarGtk::AnimationProgressed(const Animation* animation) {
-  DCHECK_EQ(animation, &upgrade_reminder_animation_);
-  if (UpgradeAnimationIsFaded())
-    gtk_widget_queue_draw(wrench_menu_button_->widget()->parent);
-}
-
-void BrowserToolbarGtk::AnimationCanceled(const Animation* animation) {
-  AnimationEnded(animation);
-}
-
-void BrowserToolbarGtk::ActiveWindowChanged(GdkWindow* active_window) {
-  MaybeShowUpgradeReminder();
-}
-
-void BrowserToolbarGtk::OnWrenchMenuShow(GtkWidget* sender) {
-  if (upgrade_reminder_animation_.is_animating()) {
-    upgrade_reminder_canceled_ = true;
-    MaybeShowUpgradeReminder();
-  }
-}
-
 gboolean BrowserToolbarGtk::OnWrenchMenuButtonExpose(GtkWidget* sender,
                                                      GdkEventExpose* expose) {
   if (!Singleton<UpgradeDetector>::get()->notify_upgrade())
     return FALSE;
 
-  SkBitmap badge;
-  if (UpgradeAnimationIsFaded()) {
-    badge = SkBitmapOperations::CreateBlendedBitmap(
-        *theme_provider_->GetBitmapNamed(IDR_UPGRADE_DOT_ACTIVE),
-        *theme_provider_->GetBitmapNamed(IDR_UPGRADE_DOT_INACTIVE),
-        upgrade_reminder_animation_.GetCurrentValue());
-  } else {
-    badge = *theme_provider_->GetBitmapNamed(IDR_UPGRADE_DOT_INACTIVE);
-  }
+  const SkBitmap& badge =
+      *theme_provider_->GetBitmapNamed(IDR_UPDATE_BADGE);
 
   // Draw the chrome app menu icon onto the canvas.
   gfx::CanvasSkiaPaint canvas(expose, false);
   int x_offset = base::i18n::IsRTL() ?
       sender->allocation.width - kUpgradeDotOffset - badge.width() :
       kUpgradeDotOffset;
-  int y_offset = sender->allocation.height / 2 + badge.height();
+  int y_offset = sender->allocation.height / 2;
   canvas.DrawBitmapInt(
       badge,
       sender->allocation.x + x_offset,
       sender->allocation.y + y_offset);

[Finnur, 2010/11/18 10:12:57]

Actually:

The badge needs to be in the top right corner, not the bottom left corner.

 
   return FALSE;
 }
-
-bool BrowserToolbarGtk::UpgradeAnimationIsFaded() {
-  return upgrade_reminder_animation_.cycles_remaining() > 0 &&
-      // This funky looking math makes the badge throb for 2 seconds once
-      // every 8 seconds.
-      ((upgrade_reminder_animation_.cycles_remaining() - 1) / 2) % 4 == 0;
-}