Index: ash/wm/visibility_controller.cc |
diff --git a/ash/wm/visibility_controller.cc b/ash/wm/visibility_controller.cc |
index b1cbcd54eeccb0983a9947ff53620a957cdd7bb4..3ed4bfce9bb3ffbe29c83b5040954f77f518c33f 100644 |
--- a/ash/wm/visibility_controller.cc |
+++ b/ash/wm/visibility_controller.cc |
@@ -6,29 +6,22 @@ |
#include "ash/shell.h" |
#include "ash/wm/window_animations.h" |
+#include "ash/wm/window_properties.h" |
#include "ui/aura/window.h" |
-#include "ui/aura/window_property.h" |
#include "ui/compositor/layer.h" |
-DECLARE_WINDOW_PROPERTY_TYPE(bool) |
- |
namespace ash { |
-namespace internal { |
-// Property set on all windows whose child windows' visibility changes are |
-// animated. |
-DEFINE_LOCAL_WINDOW_PROPERTY_KEY( |
- bool, kChildWindowVisibilityChangesAnimatedKey, false); |
- |
namespace { |
- |
bool GetChildWindowVisibilityChangesAnimated(aura::Window* window) { |
if (!window) |
return false; |
- return window->GetProperty(kChildWindowVisibilityChangesAnimatedKey); |
+ return window->GetProperty( |
+ internal::kChildWindowVisibilityChangesAnimatedKey); |
} |
- |
} // namespace |
+namespace internal { |
+ |
VisibilityController::VisibilityController() { |
aura::client::SetVisibilityClient(Shell::GetRootWindow(), this); |
} |