Index: ash/launcher/launcher_button.h |
diff --git a/ash/launcher/launcher_button.h b/ash/launcher/launcher_button.h |
index a48c2be6a1e6cfda85293760d41f2e479a1d4321..491a4a1a33f439598ffb3cbcaa3b1c31a0588908 100644 |
--- a/ash/launcher/launcher_button.h |
+++ b/ash/launcher/launcher_button.h |
@@ -5,7 +5,6 @@ |
#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" |
@@ -32,11 +31,7 @@ class LauncherButton : public views::CustomButton { |
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(); |
@@ -107,7 +102,6 @@ class LauncherButton : public views::CustomButton { |
private: |
class BarView; |
- class IconPulseAnimation; |
// Returns true if the shelf is horizontal. If this returns false the shelf is |
// vertical. |
@@ -125,10 +119,6 @@ class LauncherButton : public views::CustomButton { |
// 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); |