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

Unified Diff: ash/wm/window_properties.cc

Issue 2669633003: mash: Fix MusPropertyMirrorAsh for owned properties; add test. (Closed)
Patch Set: Fix ash shell Created 3 years, 11 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.cc
diff --git a/ash/wm/window_properties.cc b/ash/wm/window_properties.cc
index 1364c089f65e4c7b6646f35aa8fc3e19c851acde..f6f8e41a2ad3f7defca19fec758d6ddb28063971 100644
--- a/ash/wm/window_properties.cc
+++ b/ash/wm/window_properties.cc
@@ -5,7 +5,6 @@
#include "ash/wm/window_properties.h"
#include "ash/common/wm/window_state.h"
-#include "ui/base/class_property.h"
DECLARE_UI_CLASS_PROPERTY_TYPE(ash::wm::WindowState*);
DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(ASH_EXPORT, ash::WidgetCreationType);
@@ -14,8 +13,6 @@ namespace ash {
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kLockedToRootKey, false);
-DEFINE_UI_CLASS_PROPERTY_KEY(bool, kPanelAttachedKey, true);
-
DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Rect, kRestoreBoundsOverrideKey, NULL);
DEFINE_UI_CLASS_PROPERTY_KEY(ui::WindowShowState,
@@ -24,8 +21,6 @@ DEFINE_UI_CLASS_PROPERTY_KEY(ui::WindowShowState,
DEFINE_UI_CLASS_PROPERTY_KEY(ShelfID, kShelfIDKey, kInvalidShelfID);
-DEFINE_UI_CLASS_PROPERTY_KEY(int32_t, kShelfItemTypeKey, TYPE_UNDEFINED);
-
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kSnapChildrenToPixelBoundary, false);
DEFINE_UI_CLASS_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false);
« no previous file with comments | « ash/wm/window_properties.h ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698