1 files changed, 4 insertions, 19 deletions

diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk.h b/chrome/browser/gtk/tabs/tab_renderer_gtk.h
index a5e8e04..9f52a6c 100644
--- a/chrome/browser/gtk/tabs/tab_renderer_gtk.h
+++ b/chrome/browser/gtk/tabs/tab_renderer_gtk.h
@@ -14,8 +14,6 @@
 #include "base/basictypes.h"
 #include "base/gfx/rect.h"
 #include "base/string16.h"
-#include "chrome/common/notification_observer.h"
-#include "chrome/common/notification_registrar.h"
 #include "chrome/common/owned_widget_gtk.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
@@ -36,11 +34,9 @@ class TabRendererGtk : public AnimationDelegate {
     ANIMATION_LOADING
   };
 
-  class LoadingAnimation : public NotificationObserver {
+  class LoadingAnimation {
    public:
     struct Data {
-      explicit Data(ThemeProvider* theme_provider);
-
       SkBitmap* waiting_animation_frames;
       SkBitmap* loading_animation_frames;
       int loading_animation_frame_count;
@@ -48,7 +44,7 @@ class TabRendererGtk : public AnimationDelegate {
       int waiting_to_loading_frame_count_ratio;
     };
 
-    explicit LoadingAnimation(ThemeProvider* theme_provider);
+    explicit LoadingAnimation(const Data* data);
 
     // Advance the loading animation to the next frame, or hide the animation if
     // the tab isn't loading.
@@ -64,19 +60,8 @@ class TabRendererGtk : public AnimationDelegate {
       return data_->loading_animation_frames;
     }
 
-    // Provide NotificationObserver implementation.
-    virtual void Observe(NotificationType type,
-                         const NotificationSource& source,
-                         const NotificationDetails& details);
-
    private:
-    scoped_ptr<Data> data_;
-
-    // Used to listen for theme change notifications.
-    NotificationRegistrar registrar_;
-
-    // Gives us our throbber images.
-    ThemeProvider* theme_provider_;
+    const Data* const data_;
 
     // Current state of the animation.
     AnimationState animation_state_;
@@ -87,7 +72,7 @@ class TabRendererGtk : public AnimationDelegate {
     DISALLOW_COPY_AND_ASSIGN(LoadingAnimation);
   };
 
-  explicit TabRendererGtk(ThemeProvider* theme_provider);
+  TabRendererGtk();
   virtual ~TabRendererGtk();
 
   // TabContents. If only the loading state was updated, the loading_only flag