| Index: ash/wm/window_properties.cc
|
| ===================================================================
|
| --- ash/wm/window_properties.cc (revision 167688)
|
| +++ ash/wm/window_properties.cc (working copy)
|
| @@ -7,13 +7,11 @@
|
| #include "ash/root_window_controller.h"
|
| #include "ash/wm/always_on_top_controller.h"
|
| #include "ash/wm/frame_painter.h"
|
| -#include "ash/wm/shadow_types.h"
|
| #include "ui/aura/window_property.h"
|
| #include "ui/gfx/rect.h"
|
| #include "ui/ui_controls/ui_controls_aura.h"
|
|
|
| DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::AlwaysOnTopController*);
|
| -DECLARE_WINDOW_PROPERTY_TYPE(ash::internal::ShadowType);
|
| DECLARE_EXPORTED_WINDOW_PROPERTY_TYPE(ASH_EXPORT, ash::FramePainter*);
|
| DECLARE_WINDOW_PROPERTY_TYPE(ash::WindowPersistsAcrossAllWorkspacesType)
|
| DECLARE_WINDOW_PROPERTY_TYPE(ui_controls::UIControlsAura*)
|
| @@ -31,7 +29,6 @@
|
| ui::WindowShowState, kRestoreShowStateKey, ui::SHOW_STATE_DEFAULT);
|
| DEFINE_WINDOW_PROPERTY_KEY(RootWindowController*,
|
| kRootWindowControllerKey, NULL);
|
| -DEFINE_WINDOW_PROPERTY_KEY(ShadowType, kShadowTypeKey, SHADOW_TYPE_NONE);
|
| DEFINE_WINDOW_PROPERTY_KEY(
|
| ash::FramePainter*, kSoloWindowFramePainterKey, NULL);
|
| DEFINE_WINDOW_PROPERTY_KEY(bool, kStayInSameRootWindowKey, false);
|
|
|