| 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);
|
|
|