| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/views/tab_icon_view.h" | 5 #include "chrome/browser/views/tab_icon_view.h" |
| 6 | 6 |
| 7 #include <windows.h> | 7 #include <windows.h> |
| 8 #include <shellapi.h> | 8 #include <shellapi.h> |
| 9 | 9 |
| 10 #include "app/gfx/chrome_canvas.h" | 10 #include "app/gfx/chrome_canvas.h" |
| 11 #include "app/gfx/favicon_size.h" |
| 12 #include "app/gfx/icon_util.h" |
| 11 #include "app/resource_bundle.h" | 13 #include "app/resource_bundle.h" |
| 12 #include "base/file_util.h" | 14 #include "base/file_util.h" |
| 13 #include "base/path_service.h" | 15 #include "base/path_service.h" |
| 14 #include "chrome/app/chrome_dll_resource.h" | 16 #include "chrome/app/chrome_dll_resource.h" |
| 15 #include "chrome/browser/tab_contents/tab_contents.h" | 17 #include "chrome/browser/tab_contents/tab_contents.h" |
| 16 #include "chrome/common/gfx/favicon_size.h" | |
| 17 #include "chrome/common/gfx/icon_util.h" | |
| 18 #include "grit/theme_resources.h" | 18 #include "grit/theme_resources.h" |
| 19 | 19 |
| 20 static bool g_initialized = false; | 20 static bool g_initialized = false; |
| 21 static SkBitmap* g_default_fav_icon = NULL; | 21 static SkBitmap* g_default_fav_icon = NULL; |
| 22 static SkBitmap* g_throbber_frames = NULL; | 22 static SkBitmap* g_throbber_frames = NULL; |
| 23 static SkBitmap* g_throbber_frames_light = NULL; | 23 static SkBitmap* g_throbber_frames_light = NULL; |
| 24 static int g_throbber_frame_count; | 24 static int g_throbber_frame_count; |
| 25 | 25 |
| 26 // static | 26 // static |
| 27 void TabIconView::InitializeIfNeeded() { | 27 void TabIconView::InitializeIfNeeded() { |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 } | 139 } |
| 140 } | 140 } |
| 141 | 141 |
| 142 if (!rendered) | 142 if (!rendered) |
| 143 PaintFavIcon(canvas, *g_default_fav_icon); | 143 PaintFavIcon(canvas, *g_default_fav_icon); |
| 144 } | 144 } |
| 145 | 145 |
| 146 gfx::Size TabIconView::GetPreferredSize() { | 146 gfx::Size TabIconView::GetPreferredSize() { |
| 147 return gfx::Size(kFavIconSize, kFavIconSize); | 147 return gfx::Size(kFavIconSize, kFavIconSize); |
| 148 } | 148 } |
| OLD | NEW |