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

chrome/browser/ui/views/extensions/extension_install_dialog_view.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 <vector>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/i18n/rtl.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/bundle_installer.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/google_chrome_strings.h"
 #include "grit/theme_resources.h"
-#include "ui/base/animation/animation_delegate.h"
-#include "ui/base/animation/slide_animation.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/animation/animation_delegate.h"
+#include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/transform.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/layout/box_layout.h"
@@ skipping 147 matching lines @@
                          0);
   layout->StartRow(0, 0);
   layout->AddView(new views::Label(PrepareForDisplay(string16(), true)));
   layout->AddView(view);
 }
 
 // A view to display text with an expandable details section.
 class ExpandableContainerView : public views::View,
                                 public views::ButtonListener,
                                 public views::LinkListener,
-                                public ui::AnimationDelegate {
+                                public gfx::AnimationDelegate {
  public:
   ExpandableContainerView(ExtensionInstallDialogView* owner,
                           const string16& description,
                           const PermissionDetails& details,
                           int horizontal_space,
                           bool parent_bulleted);
   virtual ~ExpandableContainerView();
 
   // views::View:
   virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE;
 
   // views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE;
 
   // views::LinkListener:
   virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE;
 
-  // ui::AnimationDelegate:
-  virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
-  virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
+  // gfx::AnimationDelegate:
+  virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
+  virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
 
  private:
   // A view which displays all the details of an IssueAdviceInfoEntry.
   class DetailsView : public views::View {
    public:
     explicit DetailsView(int horizontal_space, bool parent_bulleted);
     virtual ~DetailsView() {}
 
     // views::View:
     virtual gfx::Size GetPreferredSize() OVERRIDE;
@@ skipping 19 matching lines @@
 
   // The dialog that owns |this|. It's also an ancestor in the View hierarchy.
   ExtensionInstallDialogView* owner_;
 
   // A view for showing |issue_advice.details|.
   DetailsView* details_view_;
 
   // The '>' zippy control.
   views::ImageView* arrow_view_;
 
-  ui::SlideAnimation slide_animation_;
+  gfx::SlideAnimation slide_animation_;
 
   // The 'more details' link shown under the heading (changes to 'hide details'
   // when the details section is expanded).
   views::Link* more_details_;
 
   // The up/down arrow next to the 'more detail' link (points up/down depending
   // on whether the details section is expanded).
   views::ImageButton* arrow_toggle_;
 
   // Whether the details section is expanded.
@@ skipping 579 matching lines @@
     views::Button* sender, const ui::Event& event) {
   ToggleDetailLevel();
 }
 
 void ExpandableContainerView::LinkClicked(
     views::Link* source, int event_flags) {
   ToggleDetailLevel();
 }
 
 void ExpandableContainerView::AnimationProgressed(
-    const ui::Animation* animation) {
+    const gfx::Animation* animation) {
   DCHECK_EQ(&slide_animation_, animation);
   if (details_view_)
     details_view_->AnimateToState(animation->GetCurrentValue());
 }
 
-void ExpandableContainerView::AnimationEnded(const ui::Animation* animation) {
+void ExpandableContainerView::AnimationEnded(const gfx::Animation* animation) {
   if (animation->GetCurrentValue() != 0.0) {
     arrow_toggle_->SetImage(
         views::Button::STATE_NORMAL,
         ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
             IDR_UP_ARROW));
   } else {
     arrow_toggle_->SetImage(
         views::Button::STATE_NORMAL,
         ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
             IDR_DOWN_ARROW));
   }
 
   more_details_->SetText(expanded_ ?
       l10n_util::GetStringUTF16(IDS_EXTENSIONS_HIDE_DETAILS) :
       l10n_util::GetStringUTF16(IDS_EXTENSIONS_SHOW_DETAILS));
 }
 
 void ExpandableContainerView::ChildPreferredSizeChanged(views::View* child) {
   owner_->ContentsChanged();
 }
 
 void ExpandableContainerView::ToggleDetailLevel() {
   expanded_ = !expanded_;
 
   if (slide_animation_.IsShowing())
     slide_animation_.Hide();
   else
     slide_animation_.Show();
 }