| Index: ash/shelf/shelf_util.cc
|
| diff --git a/ash/shelf/shelf_util.cc b/ash/shelf/shelf_util.cc
|
| index 717937f0dbc7a15d4cd09609c43848818e5b2848..96139c8749480627d3bab1bd8bafe9295aa7dbd0 100644
|
| --- a/ash/shelf/shelf_util.cc
|
| +++ b/ash/shelf/shelf_util.cc
|
| @@ -17,6 +17,8 @@ DEFINE_WINDOW_PROPERTY_KEY(ShelfID, kShelfID, kInvalidShelfID);
|
| // and will be freed automatically.
|
| DEFINE_OWNED_WINDOW_PROPERTY_KEY(ShelfItemDetails, kShelfItemDetailsKey, NULL);
|
|
|
| +DEFINE_WINDOW_PROPERTY_KEY(bool, kShelfItemOnTrayForImeMenu, false);
|
| +
|
| void SetShelfIDForWindow(ShelfID id, aura::Window* window) {
|
| if (!window)
|
| return;
|
|
|