[gtk] use new update badge on wrench menu

chrome/browser/gtk/browser_toolbar_gtk.h

 // 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.
 
 #ifndef CHROME_BROWSER_GTK_BROWSER_TOOLBAR_GTK_H_
 #define CHROME_BROWSER_GTK_BROWSER_TOOLBAR_GTK_H_
 #pragma once
 
 #include <gtk/gtk.h>
 #include <string>
 
 #include "app/active_window_watcher_x.h"
 #include "app/animation_delegate.h"

[Finnur, 2010/11/18 20:54:52]

nit: Was this needed?

[Evan Stade, 2010/11/18 21:25:47]

good catch. will fix.

 #include "app/gtk_signal.h"
 #include "app/gtk_signal_registrar.h"
 #include "app/menus/accelerator.h"
 #include "app/menus/simple_menu_model.h"
-#include "app/throb_animation.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/gtk/custom_button.h"
 #include "chrome/browser/gtk/menu_gtk.h"
 #include "chrome/browser/gtk/owned_widget_gtk.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/wrench_menu_model.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 
 class BackForwardButtonGtk;
 class Browser;
 class BrowserActionsToolbarGtk;
 class BrowserWindowGtk;
 class CustomDrawButton;
 class GtkThemeProvider;
 class LocationBar;
 class LocationBarViewGtk;
 class Profile;
 class ReloadButtonGtk;
 class TabContents;
 class ToolbarModel;
 
 // View class that displays the GTK version of the toolbar and routes gtk
 // events back to the Browser.
 class BrowserToolbarGtk : public CommandUpdater::CommandObserver,
                           public menus::AcceleratorProvider,
                           public MenuGtk::Delegate,
-                          public NotificationObserver,
-                          public AnimationDelegate,
-                          public ActiveWindowWatcherX::Observer {
+                          public NotificationObserver {
  public:
   explicit BrowserToolbarGtk(Browser* browser, BrowserWindowGtk* window);
   virtual ~BrowserToolbarGtk();
 
   // Create the contents of the toolbar. |top_level_window| is the GtkWindow
   // to which we attach our accelerators.
   void Init(Profile* profile, GtkWindow* top_level_window);
 
   // Set the various widgets' ViewIDs.
   void SetViewIDs();
@@ skipping 45 matching lines @@
   void Observe(NotificationType type,
                const NotificationSource& source,
                const NotificationDetails& details);
 
   Profile* profile() { return profile_; }
   void SetProfile(Profile* profile);
 
   // Message that we should react to a state change.
   void UpdateTabContents(TabContents* contents, bool should_restore_state);
 
-  // AnimationDelegate implementation ------------------------------------------
-  virtual void AnimationEnded(const Animation* animation);
-  virtual void AnimationProgressed(const Animation* animation);
-  virtual void AnimationCanceled(const Animation* animation);
-
-  // ActiveWindowWatcher::Observer implementation ------------------------------
-  virtual void ActiveWindowChanged(GdkWindow* active_window);
-
  private:
   // Connect/Disconnect signals for dragging a url onto the home button.
   void SetUpDragForHomeButton(bool enable);
 
   // Sets the top corners of the toolbar to rounded, or sets them to normal,
   // depending on the state of the browser window. Returns false if no action
   // was taken (the roundedness was already correct), true otherwise.
   bool UpdateRoundedness();
 
-  // Calculates whether the upgrade notification dot should be faded at all
-  // (as opposed to solid).
-  bool UpgradeAnimationIsFaded();
-
   // Gtk callback for the "expose-event" signal.
   // The alignment contains the toolbar.
   CHROMEGTK_CALLBACK_1(BrowserToolbarGtk, gboolean, OnAlignmentExpose,
                        GdkEventExpose*);
   CHROMEGTK_CALLBACK_1(BrowserToolbarGtk, gboolean, OnLocationHboxExpose,
                        GdkEventExpose*);
 
   // Gtk callback for the "clicked" signal.
   CHROMEGTK_CALLBACK_0(BrowserToolbarGtk, void, OnButtonClick);
 
   // Gtk callback to intercept mouse clicks to the menu buttons.
   CHROMEGTK_CALLBACK_1(BrowserToolbarGtk, gboolean, OnMenuButtonPressEvent,
                        GdkEventButton*);
 
   // Used for drags onto home button.
   CHROMEGTK_CALLBACK_6(BrowserToolbarGtk, void, OnDragDataReceived,
                        GdkDragContext*, gint, gint, GtkSelectionData*,
                        guint, guint);
 
-  // Used to stop the upgrade notification animation.
-  CHROMEGTK_CALLBACK_0(BrowserToolbarGtk, void, OnWrenchMenuShow);
-
   // Used to draw the upgrade notification badge.
   CHROMEGTK_CALLBACK_1(BrowserToolbarGtk, gboolean, OnWrenchMenuButtonExpose,
                        GdkEventExpose*);
 
   // Updates preference-dependent state.
   void NotifyPrefChanged(const std::string* pref);
 
-  // Start the upgrade notification animation if we have detected an upgrade
-  // and the current toolbar is focused.
-  void MaybeShowUpgradeReminder();
-
   static void SetSyncMenuLabel(GtkWidget* widget, gpointer userdata);
 
   // Sometimes we only want to show the location w/o the toolbar buttons (e.g.,
   // in a popup window).
   bool ShouldOnlyShowLocation() const;
 
   // An event box that holds |toolbar_|. We need the toolbar to have its own
   // GdkWindow when we use the GTK drawing because otherwise the color from our
   // parent GdkWindow will leak through with some theme engines (such as
   // Clearlooks).
@@ skipping 50 matching lines @@
 
   NotificationRegistrar registrar_;
 
   // A GtkEntry that isn't part of the hierarchy. We keep this for native
   // rendering.
   OwnedWidgetGtk offscreen_entry_;
 
   // Manages the home button drop signal handler.
   scoped_ptr<GtkSignalRegistrar> drop_handler_;
 
-  ThrobAnimation upgrade_reminder_animation_;
-
-  // We have already shown and dismissed the upgrade reminder animation.
-  bool upgrade_reminder_canceled_;
-
   DISALLOW_COPY_AND_ASSIGN(BrowserToolbarGtk);
 };
 
 #endif  // CHROME_BROWSER_GTK_BROWSER_TOOLBAR_GTK_H_