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

chrome/browser/ui/autofill/autofill_dialog_controller_impl.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_CONTROLLER_IMPL_H_
 #define CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_CONTROLLER_IMPL_H_
 
 #include <set>
 #include <vector>
 
@@ skipping 17 matching lines @@
 #include "components/autofill/core/browser/autofill_metrics.h"
 #include "components/autofill/core/browser/autofill_popup_delegate.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/browser/form_structure.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/core/browser/personal_data_manager_observer.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/ssl_status.h"
-#include "ui/base/animation/animation_delegate.h"
-#include "ui/base/animation/linear_animation.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/ui_base_types.h"
+#include "ui/gfx/animation/animation_delegate.h"
+#include "ui/gfx/animation/linear_animation.h"
 #include "url/gurl.h"
 
 class Profile;
 
 namespace content {
 class WebContents;
 }
 
 namespace user_prefs {
 class PrefRegistrySyncable;
@@ skipping 20 matching lines @@
 class AutofillDialogControllerImpl : public AutofillDialogViewDelegate,
                                      public AutofillDialogController,
                                      public AutofillPopupDelegate,
                                      public content::NotificationObserver,
                                      public content::WebContentsObserver,
                                      public SuggestionsMenuModelDelegate,
                                      public wallet::WalletClientDelegate,
                                      public wallet::WalletSigninHelperDelegate,
                                      public PersonalDataManagerObserver,
                                      public AccountChooserModelDelegate,
-                                     public ui::AnimationDelegate {
+                                     public gfx::AnimationDelegate {
  public:
   virtual ~AutofillDialogControllerImpl();
 
   static base::WeakPtr<AutofillDialogControllerImpl> Create(
       content::WebContents* contents,
       const FormData& form_structure,
       const GURL& source_url,
       const base::Callback<void(const FormStructure*,
                                 const std::string&)>& callback);
 
@@ skipping 120 matching lines @@
   // wallet::WalletSigninHelperDelegate implementation.
   virtual void OnPassiveSigninSuccess(const std::string& username) OVERRIDE;
   virtual void OnPassiveSigninFailure(
       const GoogleServiceAuthError& error) OVERRIDE;
   virtual void OnUserNameFetchSuccess(const std::string& username) OVERRIDE;
   virtual void OnUserNameFetchFailure(
       const GoogleServiceAuthError& error) OVERRIDE;
   virtual void OnDidFetchWalletCookieValue(
       const std::string& cookie_value) OVERRIDE;
 
-  // ui::AnimationDelegate implementation.
-  virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
-  virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
+  // gfx::AnimationDelegate implementation.
+  virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
+  virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
 
  protected:
   // Exposed for testing.
   AutofillDialogControllerImpl(
       content::WebContents* contents,
       const FormData& form_structure,
       const GURL& source_url,
       const base::Callback<void(const FormStructure*,
                                 const std::string&)>& callback);
 
@@ skipping 490 matching lines @@
   base::string16 scrambled_card_number_;
 
   // Two timers to deal with the card scrambling animation. The first provides
   // a one second delay before the numbers start scrambling. The second controls
   // the rate of refresh for the number scrambling.
   base::OneShotTimer<AutofillDialogControllerImpl> card_scrambling_delay_;
   base::RepeatingTimer<AutofillDialogControllerImpl> card_scrambling_refresher_;
 
   // An animation which controls the background fade when the card is done
   // scrambling.
-  ui::LinearAnimation card_generated_animation_;
+  gfx::LinearAnimation card_generated_animation_;
 
   // A username string we display in the card scrambling/generated overlay.
   base::string16 submitted_cardholder_name_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillDialogControllerImpl);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_CONTROLLER_IMPL_H_