Merge 53740 - Make the throbber and tab close button correctly respond to the...

chrome/browser/views/tabs/base_tab.h

 // 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.
 
 #ifndef CHROME_BROWSER_VIEWS_TABS_BASE_TAB_H_
 #define CHROME_BROWSER_VIEWS_TABS_BASE_TAB_H_
 
 #include "app/animation.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
@@ skipping 109 matching lines @@
 
   // views::ButtonListener overrides:
   virtual void ButtonPressed(views::Button* sender,
                              const views::Event& event);
 
   // views::ContextMenuController overrides:
   virtual void ShowContextMenu(views::View* source,
                                const gfx::Point& p,
                                bool is_mouse_gesture);
 
-  // views::View overrides:
-  virtual void OnThemeChanged();
-
   // Returns the bounds of the title.
   virtual const gfx::Rect& title_bounds() const = 0;
 
-  // Close button size.
-  static int close_button_height() { return close_button_height_; }
-  static int close_button_width() { return close_button_width_; }
-
-  // Size (width/height) of the loading animation.
-  static int loading_animation_size() { return loading_animation_size_; }
-
   static gfx::Font* font() { return font_; }
   static int font_height() { return font_height_; }
 
  private:
   // The animation object used to swap the favicon with the sad tab icon.
   class FavIconCrashAnimation;
 
   // Set the temporary offset for the favicon. This is used during the crash
   // animation.
   void SetFavIconHidingOffset(int offset);
 
   void DisplayCrashedFavIcon();
   void ResetCrashedFavIcon();
 
   // Starts/Stops the crash animation.
   void StartCrashAnimation();
   void StopCrashAnimation();
 
   // Return true if the crash animation is currently running.
   bool IsPerformingCrashAnimation() const;
 
   static void InitResources();
 
-  // Invoked when the theme changes to reload theme images.
-  static void LoadThemeImages();
-
   // The controller.
   // WARNING: this is null during detached tab dragging.
   TabController* controller_;
 
   TabRendererData data_;
 
   // True if the tab is being animated closed.
   bool closing_;
 
   // True if the tab is being dragged.
@@ skipping 21 matching lines @@
   bool throbber_disabled_;
 
   ThemeProvider* theme_provider_;
 
   // The offset used to animate the favicon location. This is used when the tab
   // crashes.
   int fav_icon_hiding_offset_;
 
   bool should_display_crashed_favicon_;
 
-  // Size of the close button.
-  static int close_button_width_;
-  static int close_button_height_;
-
-  // Size of the loading animation frames.
-  static int loading_animation_size_;
-
   static gfx::Font* font_;
   static int font_height_;
 
   DISALLOW_COPY_AND_ASSIGN(BaseTab);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_TABS_BASE_TAB_H_