Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(621)

Unified Diff: chrome/browser/ui/views/tabs/tab.h

Issue 6080002: TabStrip Cleanup (Closed) Base URL: http://git.chromium.org/git/chromium.git
Patch Set: moved declaration and removed comment Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/views/tabs/tab.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/tabs/tab.h
diff --git a/chrome/browser/ui/views/tabs/tab.h b/chrome/browser/ui/views/tabs/tab.h
index a3da1c535db98d00401738ea3339852de5216e0f..b5a54bfcff755ce7e9cfa6de47448ddaf092ecea 100644
--- a/chrome/browser/ui/views/tabs/tab.h
+++ b/chrome/browser/ui/views/tabs/tab.h
@@ -36,14 +36,10 @@ class Tab : public BaseTab {
// Set the background offset used to match the image in the inactive tab
// to the frame image.
- void SetBackgroundOffset(const gfx::Point& offset) {
+ void set_background_offset(const gfx::Point& offset) {
background_offset_ = offset;
}
- // Paints the icon. Most of the time you'll want to invoke Paint directly, but
- // in certain situations this invoked outside of Paint.
- void PaintIcon(gfx::Canvas* canvas);
-
// Returns the minimum possible size of a single unselected Tab.
static gfx::Size GetMinimumUnselectedSize();
// Returns the minimum possible size of a selected Tab. Selected tabs must
@@ -57,9 +53,6 @@ class Tab : public BaseTab {
// Returns the width for mini-tabs. Mini-tabs always have this width.
static int GetMiniWidth();
- // Loads the images to be used for the tab background.
- static void LoadTabImages();
-
protected:
virtual const gfx::Rect& title_bounds() const { return title_bounds_; }
@@ -82,6 +75,7 @@ class Tab : public BaseTab {
void PaintInactiveTabBackgroundWithTitleChange(gfx::Canvas* canvas);
void PaintInactiveTabBackground(gfx::Canvas* canvas);
void PaintActiveTabBackground(gfx::Canvas* canvas);
+ void PaintIcon(gfx::Canvas* canvas);
SkBitmap DrawHoverGlowBitmap(int width, int height);
// Returns the number of favicon-size elements that can fit in the tab's
@@ -99,6 +93,12 @@ class Tab : public BaseTab {
// mini tab title change and pulsing.
double GetThrobValue();
+ // Performs a one-time initialization of static resources such as tab images.
+ static void InitTabResources();
+
+ // Loads the images to be used for the tab background.
+ static void LoadTabImages();
+
// The bounds of various sections of the display.
gfx::Rect favicon_bounds_;
gfx::Rect title_bounds_;
@@ -120,9 +120,9 @@ class Tab : public BaseTab {
int r_width;
int y_offset;
};
- static TabImage tab_active;
- static TabImage tab_inactive;
- static TabImage tab_alpha;
+ static TabImage tab_active_;
+ static TabImage tab_inactive_;
+ static TabImage tab_alpha_;
// Whether we're showing the icon. It is cached so that we can detect when it
// changes and layout appropriately.
« no previous file with comments | « no previous file | chrome/browser/ui/views/tabs/tab.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698