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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/wm/window_properties.cc

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
« ash/wm/window_properties.h ('K') | « ash/wm/window_properties.h ('k') | chrome/browser/ui/BUILD.gn » ('j') | chrome/browser/ui/ash/launcher/chrome_launcher_controller.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/window_properties.cc
diff --git a/ash/wm/window_properties.cc b/ash/wm/window_properties.cc
index fc7ba30f7956fe8a31066cb7fd409e1728121fff..35f7ca20681d25c508e3e3cf0ab4e230af539b44 100644
--- a/ash/wm/window_properties.cc
+++ b/ash/wm/window_properties.cc
@@ -19,6 +19,14 @@ DEFINE_WINDOW_PROPERTY_KEY(ui::WindowShowState,
kRestoreShowStateOverrideKey,
ui::SHOW_STATE_DEFAULT);
+DEFINE_WINDOW_PROPERTY_KEY(int,
+ kShelfIconResourceIdKey,
+ kInvalidImageResourceID);
+
+DEFINE_WINDOW_PROPERTY_KEY(ShelfID, kShelfIDKey, kInvalidShelfID);
+
+DEFINE_WINDOW_PROPERTY_KEY(int, kShelfItemTypeKey, TYPE_UNDEFINED);
+
DEFINE_WINDOW_PROPERTY_KEY(bool, kSnapChildrenToPixelBoundary, false);
DEFINE_WINDOW_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false);
« ash/wm/window_properties.h ('K') | « ash/wm/window_properties.h ('k') | chrome/browser/ui/BUILD.gn » ('j') | chrome/browser/ui/ash/launcher/chrome_launcher_controller.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698