Move animation code to new ui/base/animation directory....

chrome/browser/ui/views/bookmark_bar_view.cc

 // Copyright (c) 2010 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/views/bookmark_bar_view.h"
 
 #include <algorithm>
 #include <limits>
 #include <set>
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "app/os_exchange_data.h"
 #include "app/resource_bundle.h"
-#include "app/slide_animation.h"
 #include "app/text_elider.h"
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/importer/importer_data_types.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/ui/views/event_utils.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/page_transition_types.h"
 #include "chrome/common/pref_names.h"
 #include "gfx/canvas_skia.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "ui/base/animation/slide_animation.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/label.h"
 #include "views/controls/menu/menu_item_view.h"
 #include "views/drag_utils.h"
 #include "views/view_constants.h"
 #include "views/widget/tooltip_manager.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
 
 #if defined(OS_WIN)
@@ skipping 116 matching lines @@
 
 class BookmarkButton : public views::TextButton {
  public:
   BookmarkButton(views::ButtonListener* listener,
                  const GURL& url,
                  const std::wstring& title,
                  Profile* profile)
       : TextButton(listener, title),
         url_(url),
         profile_(profile) {
-    show_animation_.reset(new SlideAnimation(this));
+    show_animation_.reset(new ui::SlideAnimation(this));
     if (BookmarkBarView::testing_) {
       // For some reason during testing the events generated by animating
       // throw off the test. So, don't animate while testing.
       show_animation_->Reset(1);
     } else {
       show_animation_->Show();
     }
   }
 
   bool GetTooltipText(const gfx::Point& p, std::wstring* tooltip) {
     gfx::Point location(p);
     ConvertPointToScreen(this, &location);
     *tooltip = CreateToolTipForURLAndTitle(location, url_, text(),
         UTF8ToWide(profile_->GetPrefs()->GetString(prefs::kAcceptLanguages)));
     return !tooltip->empty();
   }
 
   virtual bool IsTriggerableEvent(const views::MouseEvent& e) {
     return event_utils::IsPossibleDispositionEvent(e);
   }
 
  private:
   const GURL& url_;
   Profile* profile_;
-  scoped_ptr<SlideAnimation> show_animation_;
+  scoped_ptr<ui::SlideAnimation> show_animation_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkButton);
 };
 
 // BookmarkFolderButton -------------------------------------------------------
 
 // Buttons used for folders on the bookmark bar, including the 'other folders'
 // button.
 class BookmarkFolderButton : public views::MenuButton {
  public:
   BookmarkFolderButton(views::ButtonListener* listener,
                        const std::wstring& title,
                        views::ViewMenuDelegate* menu_delegate,
                        bool show_menu_marker)
       : MenuButton(listener, title, menu_delegate, show_menu_marker) {
-    show_animation_.reset(new SlideAnimation(this));
+    show_animation_.reset(new ui::SlideAnimation(this));
     if (BookmarkBarView::testing_) {
       // For some reason during testing the events generated by animating
       // throw off the test. So, don't animate while testing.
       show_animation_->Reset(1);
     } else {
       show_animation_->Show();
     }
   }
 
   virtual bool IsTriggerableEvent(const views::MouseEvent& e) {
     // Left clicks should show the menu contents and right clicks should show
     // the context menu. They should not trigger the opening of underlying urls.
     if (e.GetFlags() == views::MouseEvent::EF_LEFT_BUTTON_DOWN ||
         e.GetFlags() == views::MouseEvent::EF_RIGHT_BUTTON_DOWN)
       return false;
 
     WindowOpenDisposition disposition(
         event_utils::DispositionFromEventFlags(e.GetFlags()));
     return disposition != CURRENT_TAB;
   }
 
   virtual void Paint(gfx::Canvas* canvas) {
     views::MenuButton::Paint(canvas, false);
   }
 
  private:
-  scoped_ptr<SlideAnimation> show_animation_;
+  scoped_ptr<ui::SlideAnimation> show_animation_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkFolderButton);
 };
 
 // OverFlowButton (chevron) --------------------------------------------------
 
 class OverFlowButton : public views::MenuButton {
  public:
   explicit OverFlowButton(BookmarkBarView* owner)
       : MenuButton(NULL, std::wstring(), owner, false),
@@ skipping 511 matching lines @@
   // When on the New Tab Page with no infobar, animate the overlap between the
   // attached and detached states.
   return static_cast<int>(static_cast<double>(kToolbarOverlap) *
       size_animation_->GetCurrentValue());
 }
 
 bool BookmarkBarView::is_animating() {
   return size_animation_->is_animating();
 }
 
-void BookmarkBarView::AnimationProgressed(const Animation* animation) {
+void BookmarkBarView::AnimationProgressed(const ui::Animation* animation) {
   if (browser_)
     browser_->ToolbarSizeChanged(true);
 }
 
-void BookmarkBarView::AnimationEnded(const Animation* animation) {
+void BookmarkBarView::AnimationEnded(const ui::Animation* animation) {
   if (browser_)
     browser_->ToolbarSizeChanged(false);
 
   SchedulePaint();
 }
 
 void BookmarkBarView::BookmarkMenuDeleted(BookmarkMenuController* controller) {
   if (controller == bookmark_menu_)
     bookmark_menu_ = NULL;
   else if (controller == bookmark_drop_menu_)
@@ skipping 118 matching lines @@
   bookmarks_separator_view_ = new ButtonSeparatorView();
   bookmarks_separator_view_->SetAccessibleName(
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_ACCNAME_SEPARATOR)));
   AddChildView(bookmarks_separator_view_);
 
   instructions_ = new BookmarkBarInstructionsView(this);
   AddChildView(instructions_);
 
   SetContextMenuController(this);
 
-  size_animation_.reset(new SlideAnimation(this));
+  size_animation_.reset(new ui::SlideAnimation(this));
 }
 
 MenuButton* BookmarkBarView::CreateOtherBookmarkedButton() {
   MenuButton* button = new BookmarkFolderButton(
       this,
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_BOOMARK_BAR_OTHER_BOOKMARKED)),
       this,
       false);
   button->SetID(VIEW_ID_OTHER_BOOKMARKS);
   button->SetIcon(GetGroupIcon());
@@ skipping 797 matching lines @@
   // The tooltip is the only way we have to display text explaining the error
   // to the user.
   sync_error_button->SetTooltipText(
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_SYNC_BOOKMARK_BAR_ERROR_DESC)));
   sync_error_button->SetAccessibleName(
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_ACCNAME_SYNC_ERROR_BUTTON)));
   sync_error_button->SetIcon(
       *ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING));
   return sync_error_button;
 }