Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2561)

Unified Diff: ash/wm/window_properties.h

Issue 2381183002: mash: Fix shelf window property use in Chrome. (Closed)
Patch Set: Sync and rebase; add comments. Created 4 years, 3 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:
View side-by-side diff with in-line comments
Download patch
Index: ash/wm/window_properties.h
diff --git a/ash/wm/window_properties.h b/ash/wm/window_properties.h
index c6ab3d0e33c0ec8d174427c5ae263c1f51414d7c..65aac254f7a6a7865fa1247fba991ad70df62f60 100644
--- a/ash/wm/window_properties.h
+++ b/ash/wm/window_properties.h
@@ -6,6 +6,7 @@
#define ASH_WM_WINDOW_PROPERTIES_H_
#include "ash/ash_export.h"
+#include "ash/common/shelf/shelf_item_types.h"
#include "ui/base/ui_base_types.h"
#include "ui/gfx/geometry/rect.h"
@@ -42,6 +43,16 @@ ASH_EXPORT extern const aura::WindowProperty<gfx::Rect*>* const
ASH_EXPORT extern const aura::WindowProperty<ui::WindowShowState>* const
kRestoreShowStateOverrideKey;
+// A property key to store the icon resource id for a window's shelf item.
James Cook 2016/10/01 00:16:20 Hooray for nice docs on property keys.
msw 2016/10/03 19:14:22 Acknowledged.
+ASH_EXPORT extern const aura::WindowProperty<int>* const
+ kShelfIconResourceIdKey;
+
+// A property key to store the id for a window's shelf item.
+ASH_EXPORT extern const aura::WindowProperty<ShelfID>* const kShelfIDKey;
+
+// A property key to store the type of a window's shelf item.
+ASH_EXPORT extern const aura::WindowProperty<int>* const kShelfItemTypeKey;
+
// Containers with this property (true) are aligned with physical pixel
// boundary.
extern const aura::WindowProperty<bool>* const kSnapChildrenToPixelBoundary;

Powered by Google App Engine
This is Rietveld 408576698