Reland 152221 - chromeos: Sync animation.

ash/launcher/launcher_button.h

 // Copyright (c) 2012 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 ASH_LAUNCHER_LAUNCHER_BUTTON_H_
 #define ASH_LAUNCHER_LAUNCHER_BUTTON_H_
 
-#include "base/memory/scoped_ptr.h"
 #include "ui/gfx/shadow_value.h"
 #include "ui/views/controls/button/custom_button.h"
 #include "ui/views/controls/image_view.h"
 
 namespace ash {
 namespace internal {
 
 class LauncherButtonHost;
 
 // Button used for items on the launcher, except for the AppList.
 class LauncherButton : public views::CustomButton {
  public:
   // Used to indicate the current state of the button.
   enum State {
     // Nothing special. Usually represents an app shortcut item with no running
     // instance.
     STATE_NORMAL    = 0,
     // Button has mouse hovering on it.
     STATE_HOVERED   = 1 << 0,
     // Underlying LauncherItem has a running instance.
     //   e.g. A TYPE_TABBED item that has a window.
     STATE_RUNNING   = 1 << 1,
     // Underlying LauncherItem is active (i.e. has focus).
     STATE_ACTIVE    = 1 << 2,
     // Underlying LauncherItem needs user's attention.
     STATE_ATTENTION = 1 << 3,
-    // Underlying LauncherItem has pending operations.
-    //   e.g. A TYPE_APP_SHORTCUT item whose corresponding app is being
-    //        installed.
-    STATE_PENDING   = 1 << 4,
-    STATE_FOCUSED   = 1 << 5,
+    STATE_FOCUSED   = 1 << 4,
   };
 
   virtual ~LauncherButton();
 
   // Called to create an instance of a LauncherButton.
   static LauncherButton* Create(views::ButtonListener* listener,
                                 LauncherButtonHost* host);
 
   // Sets the image to display for this entry.
   void SetImage(const gfx::ImageSkia& image);
@@ skipping 50 matching lines @@
   void SetShadowedImage(const gfx::ImageSkia& bitmap);
   // Override for custom initialization.
   virtual void Init();
   // Override to subclass IconView.
   virtual IconView* CreateIconView();
   IconView* icon_view() const { return icon_view_; }
   LauncherButtonHost* host() const { return host_; }
 
  private:
   class BarView;
-  class IconPulseAnimation;
 
   // Returns true if the shelf is horizontal. If this returns false the shelf is
   // vertical.
   bool IsShelfHorizontal() const;
 
   // Updates the parts of the button to reflect the current |state_| and
   // alignment. This may add or remove views, layout and paint.
   void UpdateState();
 
   LauncherButtonHost* host_;
   IconView* icon_view_;
   // Draws a bar underneath the image to represent the state of the application.
   BarView* bar_;
   // The current state of the application, multiple values of AppState are or'd
   // together.
   int state_;
 
-  // Runs a pulse animation for |icon_view_|. It is created when button state
-  // has a STATE_PENDING bit and destroyed when that bit is clear.
-  scoped_ptr<IconPulseAnimation> icon_pulse_animation_;
-
   gfx::ShadowValues icon_shadows_;
 
   DISALLOW_COPY_AND_ASSIGN(LauncherButton);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_LAUNCHER_LAUNCHER_BUTTON_H_