Revert 170071 - Split window_animations, moving basic animations to views/corewm.

The base definition of the animation type enum also moves to corewm, and the API now allows downstream libraries (like ash) to extend the set of animations available.

This will allow us to more easily use "core" animations in desktop-aura.

I also removed the internal namespace from window_animations that remained in ash, since the use of namespaces in that file had begun to confuse me.

http://crbug.com/158115
R=sky@chromium.org
Review URL: https://codereview.chromium.org/11412223

TBR=ben@chromium.org

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170084 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 4 deletions

diff --git a/chrome/browser/chromeos/input_method/candidate_window_controller_impl.cc b/chrome/browser/chromeos/input_method/candidate_window_controller_impl.cc
index f133dae..51c5a72 100644
--- a/chrome/browser/chromeos/input_method/candidate_window_controller_impl.cc
+++ b/chrome/browser/chromeos/input_method/candidate_window_controller_impl.cc
@@ -60,9 +60,9 @@ void CandidateWindowControllerImpl::CreateView() {
 #endif
   frame_->Init(params);
 #if defined(USE_ASH)
-  views::corewm::SetWindowVisibilityAnimationType(
+  ash::SetWindowVisibilityAnimationType(
       frame_->GetNativeView(),
-      views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
+      ash::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
 #endif  // USE_ASH
 
   // Create the candidate window.
@@ -77,9 +77,9 @@ void CandidateWindowControllerImpl::CreateView() {
   infolist_window_.reset(new DelayableWidget);
   infolist_window_->Init(params);
 #if defined(USE_ASH)
-  views::corewm::SetWindowVisibilityAnimationType(
+  ash::SetWindowVisibilityAnimationType(
       infolist_window_->GetNativeView(),
-      views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
+      ash::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
 #endif  // USE_ASH
 
   InfolistWindowView* infolist_view = new InfolistWindowView;