Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(168)

Unified Diff: ash/launcher/launcher_button.h

Issue 10827420: Revert 152221 - chromeos: Sync animation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/launcher/app_list_button.cc ('k') | ash/launcher/launcher_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/launcher/launcher_button.h
===================================================================
--- ash/launcher/launcher_button.h (revision 152351)
+++ ash/launcher/launcher_button.h (working copy)
@@ -5,6 +5,7 @@
#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"
@@ -31,7 +32,11 @@
STATE_ACTIVE = 1 << 2,
// Underlying LauncherItem needs user's attention.
STATE_ATTENTION = 1 << 3,
- STATE_FOCUSED = 1 << 4,
+ // 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,
};
virtual ~LauncherButton();
@@ -102,6 +107,7 @@
private:
class BarView;
+ class IconPulseAnimation;
// Returns true if the shelf is horizontal. If this returns false the shelf is
// vertical.
@@ -119,6 +125,10 @@
// 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);
« no previous file with comments | « ash/launcher/app_list_button.cc ('k') | ash/launcher/launcher_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698