| Index: ash/launcher/launcher_types.cc
|
| diff --git a/ash/launcher/launcher_types.cc b/ash/launcher/launcher_types.cc
|
| index 67dc5729c94776db6cabd33404169da1649aef60..ecdf3266e6c296685c16ffebea40fe21981eba7b 100644
|
| --- a/ash/launcher/launcher_types.cc
|
| +++ b/ash/launcher/launcher_types.cc
|
| @@ -4,17 +4,13 @@
|
|
|
| #include "ash/launcher/launcher_types.h"
|
|
|
| -namespace ash {
|
| +#include "ash/shelf/shelf_constants.h"
|
|
|
| -const int kLauncherPreferredSize = 48;
|
| -const int kLauncherBackgroundAlpha = 204;
|
| -const int kInvalidImageResourceID = -1;
|
| -const int kInvalidLauncherID = 0;
|
| -const int kTimeToSwitchBackgroundMs = 1000;
|
| +namespace ash {
|
|
|
| LauncherItem::LauncherItem()
|
| : type(TYPE_UNDEFINED),
|
| - id(kInvalidLauncherID),
|
| + id(kInvalidShelfID),
|
| status(STATUS_CLOSED) {
|
| }
|
|
|
|
|