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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/wm/window_properties.cc

Issue 2539363005: Converts ash to use aura-mus (Closed)
Patch Set: merge Created 4 years 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/mus/window_properties.h ('K') | « ash/wm/window_properties.h ('k') | chrome/browser/ui/ash/property_util.cc » ('j') | services/ui/ws/focus_controller.cc » ('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 1e446774adf3b78d7c6b3f0b94f89ccee960479b..b5a405df2fc412c37702ab0d13e0bf6ba2fdb046 100644
--- a/ash/wm/window_properties.cc
+++ b/ash/wm/window_properties.cc
@@ -21,7 +21,7 @@ DEFINE_WINDOW_PROPERTY_KEY(ui::WindowShowState,
DEFINE_WINDOW_PROPERTY_KEY(ShelfID, kShelfIDKey, kInvalidShelfID);
-DEFINE_WINDOW_PROPERTY_KEY(int, kShelfItemTypeKey, TYPE_UNDEFINED);
+DEFINE_WINDOW_PROPERTY_KEY(int32_t, kShelfItemTypeKey, TYPE_UNDEFINED);
DEFINE_WINDOW_PROPERTY_KEY(bool, kSnapChildrenToPixelBoundary, false);
« ash/mus/window_properties.h ('K') | « ash/wm/window_properties.h ('k') | chrome/browser/ui/ash/property_util.cc » ('j') | services/ui/ws/focus_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698