| Index: ash/wm/window_properties.cc
|
| diff --git a/ash/wm/window_properties.cc b/ash/wm/window_properties.cc
|
| index 35f7ca20681d25c508e3e3cf0ab4e230af539b44..1e446774adf3b78d7c6b3f0b94f89ccee960479b 100644
|
| --- a/ash/wm/window_properties.cc
|
| +++ b/ash/wm/window_properties.cc
|
| @@ -19,10 +19,6 @@ DEFINE_WINDOW_PROPERTY_KEY(ui::WindowShowState,
|
| kRestoreShowStateOverrideKey,
|
| ui::SHOW_STATE_DEFAULT);
|
|
|
| -DEFINE_WINDOW_PROPERTY_KEY(int,
|
| - kShelfIconResourceIdKey,
|
| - kInvalidImageResourceID);
|
| -
|
| DEFINE_WINDOW_PROPERTY_KEY(ShelfID, kShelfIDKey, kInvalidShelfID);
|
|
|
| DEFINE_WINDOW_PROPERTY_KEY(int, kShelfItemTypeKey, TYPE_UNDEFINED);
|
|
|