wm: public window_types.

ui/views/corewm/window_animations.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/window_animations.h"
 
 #include <math.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 69 matching lines @@
 const float kWindowAnimation_Rotate_DegreesX = 5.f;
 const float kWindowAnimation_Rotate_ScaleFactor = .99f;
 
 const float kWindowAnimation_Bounce_Scale = 1.02f;
 const int kWindowAnimation_Bounce_DurationMS = 180;
 const int kWindowAnimation_Bounce_GrowShrinkDurationPercent = 40;
 
 base::TimeDelta GetWindowVisibilityAnimationDuration(aura::Window* window) {
   int duration =
       window->GetProperty(kWindowVisibilityAnimationDurationKey);
-  if (duration == 0 && window->type() == aura::client::WINDOW_TYPE_MENU) {
+  if (duration == 0 && window->type() == ui::wm::WINDOW_TYPE_MENU) {
     return base::TimeDelta::FromMilliseconds(
         kDefaultAnimationDurationForMenuMS);
   }
   return TimeDelta::FromInternalValue(duration);
 }
 
 // Gets/sets the WindowVisibilityAnimationType associated with a window.
 // TODO(beng): redundant/fold into method on public api?
 int GetWindowVisibilityAnimationType(aura::Window* window) {
   int type = window->GetProperty(kWindowVisibilityAnimationTypeKey);
   if (type == WINDOW_VISIBILITY_ANIMATION_TYPE_DEFAULT) {
-    return (window->type() == aura::client::WINDOW_TYPE_MENU ||
-            window->type() == aura::client::WINDOW_TYPE_TOOLTIP) ?
-        WINDOW_VISIBILITY_ANIMATION_TYPE_FADE :
-        WINDOW_VISIBILITY_ANIMATION_TYPE_DROP;
+    return (window->type() == ui::wm::WINDOW_TYPE_MENU ||
+            window->type() == ui::wm::WINDOW_TYPE_TOOLTIP)
+               ? WINDOW_VISIBILITY_ANIMATION_TYPE_FADE
+               : WINDOW_VISIBILITY_ANIMATION_TYPE_DROP;
   }
   return type;
 }
 
 // Observes a hide animation.
 // A window can be hidden for a variety of reasons. Sometimes, Hide() will be
 // called and life is simple. Sometimes, the window is actually bound to a
 // views::Widget and that Widget is closed, and life is a little more
 // complicated. When a Widget is closed the aura::Window* is actually not
 // destroyed immediately - it is actually just immediately hidden and then
@@ skipping 448 matching lines @@
 
 bool WindowAnimationsDisabled(aura::Window* window) {
   return (window &&
           window->GetProperty(aura::client::kAnimationsDisabledKey)) ||
       CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kWindowAnimationsDisabled);
 }
 
 }  // namespace corewm
 }  // namespace views