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

chrome/browser/ui/views/toolbar_view.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_UI_VIEWS_TOOLBAR_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 21 matching lines @@
 class Menu2;
 }  // namespace views
 #endif
 class WrenchMenu;
 
 // The Browser Window's toolbar.
 class ToolbarView : public AccessiblePaneView,
                     public views::ViewMenuDelegate,
                     public menus::AcceleratorProvider,
                     public LocationBarView::Delegate,
-                    public AnimationDelegate,
                     public NotificationObserver,
                     public CommandUpdater::CommandObserver,
                     public views::ButtonListener {
  public:
   explicit ToolbarView(Browser* browser);
   virtual ~ToolbarView();
 
   // Create the contents of the Browser Toolbar
   void Init(Profile* profile);
 
@@ skipping 41 matching lines @@
   virtual bool GetAcceleratorInfo(int id, menus::Accelerator* accel);
 
   // Overridden from views::MenuDelegate:
   virtual void RunMenu(views::View* source, const gfx::Point& pt);
 
   // Overridden from LocationBarView::Delegate:
   virtual TabContents* GetTabContents();
   virtual InstantController* GetInstant();
   virtual void OnInputInProgress(bool in_progress);
 
-  // Overridden from AnimationDelegate:
-  virtual void AnimationProgressed(const Animation* animation);
-
   // Overridden from CommandUpdater::CommandObserver:
   virtual void EnabledStateChangedForCommand(int id, bool enabled);
 
   // Overridden from views::BaseButton::ButtonListener:
   virtual void ButtonPressed(views::Button* sender, const views::Event& event);
 
   // Overridden from NotificationObserver:
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
@@ skipping 37 matching lines @@
   // Types of display mode this toolbar can have.
   enum DisplayMode {
     DISPLAYMODE_NORMAL,       // Normal toolbar with buttons, etc.
     DISPLAYMODE_LOCATION      // Slimline toolbar showing only compact location
                               // bar, used for popups.
   };
   bool IsDisplayModeNormal() const {
     return display_mode_ == DISPLAYMODE_NORMAL;
   }
 
-  // Starts the recurring timer that periodically asks the notification dot
-  // to pulsate.
-  void ShowNotificationDot();
+  // Updates the badge on the app menu (Wrench).
+  void UpdateAppMenuBadge();
 
-  // Show the reminder, tempting the user to take a look.
-  void PulsateNotificationDot();
-
-  // Gets a canvas with the icon for the app menu. It will possibly contain
-  // an overlaid badge if an update is recommended.
+  // Gets a bitmap with the icon for the app menu and any overlaid notification
+  // badge.
   SkBitmap GetAppMenuIcon(views::CustomButton::ButtonState state);
 
   scoped_ptr<BackForwardMenuModel> back_menu_model_;
   scoped_ptr<BackForwardMenuModel> forward_menu_model_;
 
   // The model that contains the security level, text, icon to display...
   ToolbarModel* model_;
 
   // Controls
   views::ImageButton* back_;
@@ skipping 23 matching lines @@
   // MenuLister is managed by Menu2.
   scoped_ptr<views::Menu2> wrench_menu_2_;
 #endif
 
   // Wrench menu.
   scoped_refptr<WrenchMenu> wrench_menu_;
 
   // Vector of listeners to receive callbacks when the menu opens.
   std::vector<views::MenuListener*> menu_listeners_;
 
-  // The animation that makes the notification dot pulse.
-  scoped_ptr<SlideAnimation> notification_dot_animation_;
-
-  // We periodically restart the animation after it has been showed
-  // once, to create a pulsating effect.
-  base::RepeatingTimer<ToolbarView> notification_dot_pulse_timer_;
-
   // Used to post tasks to switch to the next/previous menu.
   ScopedRunnableMethodFactory<ToolbarView> method_factory_;
 
   NotificationRegistrar registrar_;
 
   // If non-null the destructor sets this to true. This is set to a non-null
   // while the menu is showing and used to detect if the menu was deleted while
   // running.
   bool* destroyed_flag_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_