ash/aura/wm_window_aura.cc - Issue 2381183002: mash: Fix shelf window property use in Chrome.

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/aura/wm_window_aura.cc

Issue 2381183002: mash: Fix shelf window property use in Chrome. (Closed)

Patch Set: Address comments, cleanup, and try to fix build issues. Created 4 years, 2 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/aura/wm_window_aura.cc

diff --git a/ash/aura/wm_window_aura.cc b/ash/aura/wm_window_aura.cc

index 097733f1e1a7cf595aed0621604e54eefd359d09..e4dd197759e5cb574ccbc00d6dd6f9cbbbd2f347 100644

--- a/ash/aura/wm_window_aura.cc

+++ b/ash/aura/wm_window_aura.cc

@@ -49,12 +49,6 @@ DECLARE_WINDOW_PROPERTY_TYPE(ash::WmWindowAura*);

namespace ash {

-DEFINE_WINDOW_PROPERTY_KEY(ShelfID, kShelfIDKey, kInvalidShelfID);

-DEFINE_WINDOW_PROPERTY_KEY(int, kShelfItemTypeKey, TYPE_UNDEFINED);

-DEFINE_WINDOW_PROPERTY_KEY(int,

- kShelfIconResourceIdKey,

- kInvalidImageResourceID);

DEFINE_OWNED_WINDOW_PROPERTY_KEY(WmWindowAura, kWmWindowKey, nullptr);

static_assert(aura::Window::kInitialId == kShellWindowId_Invalid,