ui/base/animation -> ui/gfx/animation

chrome/browser/ui/views/fullscreen_exit_bubble_views.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 "chrome/browser/ui/views/fullscreen_exit_bubble_views.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
 #include "chrome/browser/ui/views/frame/top_container_view.h"
 #include "content/public/browser/notification_service.h"
 #include "grit/generated_resources.h"
 #include "grit/ui_strings.h"
-#include "ui/base/animation/slide_animation.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/bubble/bubble_border.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
@@ skipping 222 matching lines @@
 
 // FullscreenExitBubbleViews ---------------------------------------------------
 
 FullscreenExitBubbleViews::FullscreenExitBubbleViews(
     BrowserView* browser_view,
     const GURL& url,
     FullscreenExitBubbleType bubble_type)
     : FullscreenExitBubble(browser_view->browser(), url, bubble_type),
       browser_view_(browser_view),
       popup_(NULL),
-      animation_(new ui::SlideAnimation(this)),
+      animation_(new gfx::SlideAnimation(this)),
       animated_attribute_(ANIMATED_ATTRIBUTE_BOUNDS) {
   animation_->Reset(1);
 
   // Create the contents view.
   ui::Accelerator accelerator(ui::VKEY_UNKNOWN, ui::EF_NONE);
   bool got_accelerator = browser_view_->GetWidget()->GetAccelerator(
       IDC_FULLSCREEN, &accelerator);
   DCHECK(got_accelerator);
   view_ = new FullscreenExitView(
       this, accelerator.GetShortcutText(), url, bubble_type_);
@@ skipping 122 matching lines @@
     popup_->SetBounds(popup_rect);
     view_->SetY(popup_rect.height() - view_->height());
   }
 }
 
 views::View* FullscreenExitBubbleViews::GetBrowserRootView() const {
   return browser_view_->GetWidget()->GetRootView();
 }
 
 void FullscreenExitBubbleViews::AnimationProgressed(
-    const ui::Animation* animation) {
+    const gfx::Animation* animation) {
   if (animated_attribute_ == ANIMATED_ATTRIBUTE_OPACITY) {
     int opacity = animation_->CurrentValueBetween(0, 255);
     if (opacity == 0) {
       popup_->Hide();
     } else {
       popup_->Show();
       popup_->SetOpacity(opacity);
     }
   } else {
     if (GetPopupRect(false).IsEmpty()) {
       popup_->Hide();
     } else {
       UpdateBounds();
       popup_->Show();
     }
   }
 }
 
 void FullscreenExitBubbleViews::AnimationEnded(
-    const ui::Animation* animation) {
+    const gfx::Animation* animation) {
   AnimationProgressed(animation);
 }
 
 gfx::Rect FullscreenExitBubbleViews::GetPopupRect(
     bool ignore_animation_state) const {
   gfx::Size size(view_->GetPreferredSize());
   // NOTE: don't use the bounds of the root_view_. On linux GTK changing window
   // size is async. Instead we use the size of the screen.
   gfx::Screen* screen =
       gfx::Screen::GetScreenFor(browser_view_->GetWidget()->GetNativeView());
@@ skipping 67 matching lines @@
     const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_FULLSCREEN_CHANGED, type);
   UpdateForImmersiveState();
 }
 
 void FullscreenExitBubbleViews::OnWidgetVisibilityChanged(
     views::Widget* widget,
     bool visible) {
   UpdateMouseWatcher();
 }