1 files changed, 13 insertions, 13 deletions

diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc
index 7bae5a3..a5b3653 100644
--- a/ash/wm/window_animations.cc
+++ b/ash/wm/window_animations.cc
@@ -69,7 +69,7 @@ int64 Round64(float f) {
 base::TimeDelta GetCrossFadeDuration(aura::Window* window,
                                      const gfx::Rect& old_bounds,
                                      const gfx::Rect& new_bounds) {
-  if (::wm::WindowAnimationsDisabled(window))
+  if (views::corewm::WindowAnimationsDisabled(window))
     return base::TimeDelta();
 
   int old_area = old_bounds.width() * old_bounds.height();
@@ -165,8 +165,8 @@ void AnimateShowWindow_Minimize(aura::Window* window) {
 
   // Now that the window has been restored, we need to clear its animation style
   // to default so that normal animation applies.
-  ::wm::SetWindowVisibilityAnimationType(
-      window, ::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_DEFAULT);
+  views::corewm::SetWindowVisibilityAnimationType(
+      window, views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_DEFAULT);
 }
 
 void AnimateHideWindow_Minimize(aura::Window* window) {
@@ -178,7 +178,7 @@ void AnimateHideWindow_Minimize(aura::Window* window) {
       kLayerAnimationsForMinimizeDurationMS);
   settings.SetTransitionDuration(duration);
   settings.AddObserver(
-      ::wm::CreateHidingWindowAnimationObserver(window));
+      views::corewm::CreateHidingWindowAnimationObserver(window));
   window->layer()->SetVisible(false);
 
   AddLayerAnimationsForMinimize(window, false);
@@ -211,7 +211,7 @@ void AnimateShowHideWindowCommon_BrightnessGrayscale(aura::Window* window,
   settings.SetTransitionDuration(duration);
   if (!show) {
     settings.AddObserver(
-        ::wm::CreateHidingWindowAnimationObserver(window));
+        views::corewm::CreateHidingWindowAnimationObserver(window));
   }
 
   window->layer()->GetAnimator()->
@@ -232,12 +232,12 @@ void AnimateHideWindow_BrightnessGrayscale(aura::Window* window) {
 }
 
 bool AnimateShowWindow(aura::Window* window) {
-  if (!::wm::HasWindowVisibilityAnimationTransition(
-          window, ::wm::ANIMATE_SHOW)) {
+  if (!views::corewm::HasWindowVisibilityAnimationTransition(
+          window, views::corewm::ANIMATE_SHOW)) {
     return false;
   }
 
-  switch (::wm::GetWindowVisibilityAnimationType(window)) {
+  switch (views::corewm::GetWindowVisibilityAnimationType(window)) {
     case WINDOW_VISIBILITY_ANIMATION_TYPE_MINIMIZE:
       AnimateShowWindow_Minimize(window);
       return true;
@@ -251,12 +251,12 @@ bool AnimateShowWindow(aura::Window* window) {
 }
 
 bool AnimateHideWindow(aura::Window* window) {
-  if (!::wm::HasWindowVisibilityAnimationTransition(
-          window, ::wm::ANIMATE_HIDE)) {
+  if (!views::corewm::HasWindowVisibilityAnimationTransition(
+          window, views::corewm::ANIMATE_HIDE)) {
     return false;
   }
 
-  switch (::wm::GetWindowVisibilityAnimationType(window)) {
+  switch (views::corewm::GetWindowVisibilityAnimationType(window)) {
     case WINDOW_VISIBILITY_ANIMATION_TYPE_MINIMIZE:
       AnimateHideWindow_Minimize(window);
       return true;
@@ -401,11 +401,11 @@ base::TimeDelta CrossFadeAnimation(
 }
 
 bool AnimateOnChildWindowVisibilityChanged(aura::Window* window, bool visible) {
-  if (::wm::WindowAnimationsDisabled(window))
+  if (views::corewm::WindowAnimationsDisabled(window))
     return false;
 
   // Attempt to run CoreWm supplied animation types.
-  if (::wm::AnimateOnChildWindowVisibilityChanged(window, visible))
+  if (views::corewm::AnimateOnChildWindowVisibilityChanged(window, visible))
     return true;
 
   // Otherwise try to run an Ash-specific animation.