Minor cleanup to OneShotTimer and RepeatingTimer: moves more of the member variables into the Task subclass.

Also included in this change: deprecate MessageLoop::timer_manager(), and change consumers over to use OneShotTimer or RepeatingTimer.

R=beng
BUG=1346553

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

1 files changed, 1 insertions, 7 deletions

diff --git a/chrome/browser/tabs/tab_strip.h b/chrome/browser/tabs/tab_strip.h
index 9d2ed08..11f6f64 100644
--- a/chrome/browser/tabs/tab_strip.h
+++ b/chrome/browser/tabs/tab_strip.h
@@ -6,7 +6,6 @@
 #define CHROME_BROWSER_TABS_TAB_STRIP_H__
 
 #include "base/gfx/point.h"
-#include "base/task.h"
 #include "chrome/browser/tabs/tab.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/views/button.h"
@@ -17,7 +16,6 @@
 class DraggedTabController;
 class ScopedMouseCloseWidthCalculator;
 class TabStripModel;
-class Timer;
 
 namespace ChromeViews {
 class ImageView;
@@ -40,7 +38,6 @@ class TabStrip : public ChromeViews::View,
                  public TabStripModelObserver,
                  public Tab::TabDelegate,
                  public ChromeViews::Button::ButtonListener,
-                 public Task,
                  public MessageLoopForUI::Observer {
  public:
   TabStrip(TabStripModel* model);
@@ -153,9 +150,6 @@ class TabStrip : public ChromeViews::View,
   // ChromeViews::Button::ButtonListener implementation:
   virtual void ButtonPressed(ChromeViews::BaseButton* sender);
 
-  // Task implementation:
-  virtual void Run();
-
   // MessageLoop::Observer implementation:
   virtual void WillProcessMessage(const MSG& msg);
   virtual void DidProcessMessage(const MSG& msg);
@@ -303,7 +297,7 @@ class TabStrip : public ChromeViews::View,
   bool resize_layout_scheduled_;
 
   // The timer used to update frames for the Loading Animation.
-  scoped_ptr<Timer> loading_animation_timer_;
+  base::RepeatingTimer<TabStrip> loading_animation_timer_;
 
   // The "New Tab" button.
   ChromeViews::Button* newtab_button_;