| 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 accdc108778efac75e8a061c4dd2546bd48d03bf..e34d0d53ceb93b6bc2d94127ef11f1e82156ad69 100644
|
| --- a/chrome/browser/ui/views/tabs/tab.h
|
| +++ b/chrome/browser/ui/views/tabs/tab.h
|
| @@ -16,6 +16,7 @@
|
| #include "ui/base/layout.h"
|
| #include "ui/gfx/animation/animation_delegate.h"
|
| #include "ui/gfx/geometry/point.h"
|
| +#include "ui/gfx/image/image_skia.h"
|
| #include "ui/gfx/paint_throbber.h"
|
| #include "ui/views/context_menu_controller.h"
|
| #include "ui/views/controls/button/button.h"
|
| @@ -291,9 +292,7 @@ class Tab : public gfx::AnimationDelegate,
|
| // animation.
|
| void SetFaviconHidingOffset(int offset);
|
|
|
| - void set_should_display_crashed_favicon() {
|
| - should_display_crashed_favicon_ = true;
|
| - }
|
| + void SetShouldDisplayCrashedFavicon(bool value);
|
|
|
| // Recalculates the correct |button_color_| and resets the title, alert
|
| // indicator, and close button colors if necessary. This should be called any
|
| @@ -396,6 +395,11 @@ class Tab : public gfx::AnimationDelegate,
|
| // The current color of the alert indicator and close button icons.
|
| SkColor button_color_;
|
|
|
| + // The favicon for the tab. This might be the sad tab icon or a copy of
|
| + // data().favicon and may be modified for theming. It is created on demand
|
| + // and thus may be null.
|
| + gfx::ImageSkia favicon_;
|
| +
|
| // As the majority of the tabs are inactive, and painting tabs is slowish,
|
| // we cache a handful of the inactive tab backgrounds here.
|
| static ImageCache* image_cache_;
|
|
|