| Index: ash/shelf/shelf_util.h
|
| diff --git a/ash/shelf/shelf_util.h b/ash/shelf/shelf_util.h
|
| index 3a6eb9bf68bde56cf278ede803d8433765f5303d..517a19f33387270f78fbf0687237378c339bd6f2 100644
|
| --- a/ash/shelf/shelf_util.h
|
| +++ b/ash/shelf/shelf_util.h
|
| @@ -25,6 +25,11 @@ extern const aura::WindowProperty<ShelfID>* const kShelfID;
|
| extern const aura::WindowProperty<ShelfItemDetails*>* const
|
| kShelfItemDetailsKey;
|
|
|
| +// A property key to indicate that the item should should be shown on tray
|
| +// instead of shelf, which is only used for IME menu.
|
| +ASH_EXPORT extern const aura::WindowProperty<bool>* const
|
| + kShelfItemOnTrayForImeMenu;
|
| +
|
| // Associates ShelfItem of |id| with specified |window|.
|
| ASH_EXPORT void SetShelfIDForWindow(ShelfID id, aura::Window* window);
|
|
|
|
|