wm: public window_types.

ui/views/corewm/visibility_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/corewm/visibility_controller.h"
 
 #include "ui/aura/window.h"
 #include "ui/aura/window_property.h"
 #include "ui/compositor/layer.h"
 #include "ui/views/corewm/window_animations.h"
@@ skipping 22 matching lines @@
 }
 
 bool VisibilityController::CallAnimateOnChildWindowVisibilityChanged(
     aura::Window* window,
     bool visible) {
   return AnimateOnChildWindowVisibilityChanged(window, visible);
 }
 
 void VisibilityController::UpdateLayerVisibility(aura::Window* window,
                                                  bool visible) {
-  bool animated = window->type() != aura::client::WINDOW_TYPE_CONTROL &&
-                  window->type() != aura::client::WINDOW_TYPE_UNKNOWN &&
+  bool animated = window->type() != ui::wm::WINDOW_TYPE_CONTROL &&
+                  window->type() != ui::wm::WINDOW_TYPE_UNKNOWN &&
                   ShouldAnimateWindow(window);
   animated = animated &&
       CallAnimateOnChildWindowVisibilityChanged(window, visible);
 
   if (!visible) {
     // For window hiding animation, we want to check if the window is already
     // animating, and not do SetVisible(false) if it is.
     // TODO(vollick): remove this.
     animated = animated || (window->layer()->GetAnimator()->
         IsAnimatingProperty(ui::LayerAnimationElement::OPACITY) &&
@@ skipping 23 matching lines @@
     window_->ClearProperty(kChildWindowVisibilityChangesAnimatedKey);
 }
 
 void SetChildWindowVisibilityChangesAnimated(aura::Window* window) {
   window->SetProperty(kChildWindowVisibilityChangesAnimatedKey, true);
 }
 
 }  // namespace corewm
 }  // namespace views