| Index: ash/wm/window_properties.cc
|
| diff --git a/ash/wm/window_properties.cc b/ash/wm/window_properties.cc
|
| index 6d381a35aed7df33c999b0aeefbec2eab41b44e7..5f94e08dd729fe1f8da44868bd0af2f62928c823 100644
|
| --- a/ash/wm/window_properties.cc
|
| +++ b/ash/wm/window_properties.cc
|
| @@ -11,9 +11,7 @@ DECLARE_WINDOW_PROPERTY_TYPE(ash::wm::WindowState*);
|
|
|
| namespace ash {
|
|
|
| -DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect,
|
| - kRestoreBoundsOverrideKey,
|
| - NULL);
|
| +DEFINE_OWNED_WINDOW_PROPERTY_KEY(gfx::Rect, kRestoreBoundsOverrideKey, NULL);
|
|
|
| DEFINE_WINDOW_PROPERTY_KEY(ui::WindowShowState,
|
| kRestoreShowStateOverrideKey,
|
| @@ -25,7 +23,6 @@ DEFINE_WINDOW_PROPERTY_KEY(bool, kStayInSameRootWindowKey, false);
|
|
|
| DEFINE_WINDOW_PROPERTY_KEY(bool, kUsesScreenCoordinatesKey, false);
|
|
|
| -DEFINE_OWNED_WINDOW_PROPERTY_KEY(wm::WindowState,
|
| - kWindowStateKey, NULL);
|
| +DEFINE_OWNED_WINDOW_PROPERTY_KEY(wm::WindowState, kWindowStateKey, NULL);
|
|
|
| } // namespace ash
|
|
|