| Index: chrome/browser/ui/views/tab_icon_view.cc
|
| diff --git a/chrome/browser/ui/views/tab_icon_view.cc b/chrome/browser/ui/views/tab_icon_view.cc
|
| index 400c7e4e0be61eee0bd3faf7d74a429967915eb2..bf9110d895c9c4b058582bbd34898f819d68476e 100644
|
| --- a/chrome/browser/ui/views/tab_icon_view.cc
|
| +++ b/chrome/browser/ui/views/tab_icon_view.cc
|
| @@ -25,8 +25,12 @@
|
| #include "ui/gfx/icon_util.h"
|
| #endif
|
|
|
| -static bool g_initialized = false;
|
| -static gfx::ImageSkia* g_default_favicon = NULL;
|
| +namespace {
|
| +
|
| +bool g_initialized = false;
|
| +gfx::ImageSkia* g_default_favicon = nullptr;
|
| +
|
| +} // namespace
|
|
|
| // static
|
| void TabIconView::InitializeIfNeeded() {
|
| @@ -137,6 +141,14 @@ void TabIconView::PaintIcon(gfx::Canvas* canvas,
|
| dest_h, filter);
|
| }
|
|
|
| +gfx::Size TabIconView::GetPreferredSize() const {
|
| + return gfx::Size(gfx::kFaviconSize, gfx::kFaviconSize);
|
| +}
|
| +
|
| +const char* TabIconView::GetClassName() const {
|
| + return "TabIconView";
|
| +}
|
| +
|
| void TabIconView::OnPaint(gfx::Canvas* canvas) {
|
| bool rendered = false;
|
|
|
| @@ -154,7 +166,3 @@ void TabIconView::OnPaint(gfx::Canvas* canvas) {
|
| if (!rendered)
|
| PaintFavicon(canvas, *g_default_favicon);
|
| }
|
| -
|
| -gfx::Size TabIconView::GetPreferredSize() const {
|
| - return gfx::Size(gfx::kFaviconSize, gfx::kFaviconSize);
|
| -}
|
|
|