ash/shelf/shelf_util.cc - Issue 1996563002: Add ImeMenuTray element.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/shelf/shelf_util.cc

Issue 1996563002: Add ImeMenuTray element. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Change SetWindowState() with SetImeWindow(). Created 4 years, 6 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:

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;