OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/ui/views/tab_icon_view.h" | 5 #include "chrome/browser/ui/views/tab_icon_view.h" |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <windows.h> | 8 #include <windows.h> |
9 #include <shellapi.h> | 9 #include <shellapi.h> |
10 #endif | 10 #endif |
11 | 11 |
12 #include "base/logging.h" | 12 #include "base/logging.h" |
13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
14 #include "chrome/app/chrome_command_ids.h" | 14 #include "chrome/app/chrome_command_ids.h" |
15 #include "chrome/browser/ui/views/tab_icon_view_model.h" | 15 #include "chrome/browser/ui/views/tab_icon_view_model.h" |
16 #include "grit/theme_resources.h" | 16 #include "grit/theme_resources.h" |
17 #include "grit/ui_resources.h" | |
18 #include "ui/base/resource/resource_bundle.h" | 17 #include "ui/base/resource/resource_bundle.h" |
19 #include "ui/base/theme_provider.h" | 18 #include "ui/base/theme_provider.h" |
20 #include "ui/gfx/canvas.h" | 19 #include "ui/gfx/canvas.h" |
21 #include "ui/gfx/favicon_size.h" | 20 #include "ui/gfx/favicon_size.h" |
| 21 #include "ui/resources/grit/ui_resources.h" |
22 | 22 |
23 #if defined(OS_WIN) | 23 #if defined(OS_WIN) |
24 #include "chrome/browser/app_icon_win.h" | 24 #include "chrome/browser/app_icon_win.h" |
25 #include "ui/gfx/icon_util.h" | 25 #include "ui/gfx/icon_util.h" |
26 #endif | 26 #endif |
27 | 27 |
28 static bool g_initialized = false; | 28 static bool g_initialized = false; |
29 static gfx::ImageSkia* g_default_favicon = NULL; | 29 static gfx::ImageSkia* g_default_favicon = NULL; |
30 | 30 |
31 // static | 31 // static |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
151 } | 151 } |
152 } | 152 } |
153 | 153 |
154 if (!rendered) | 154 if (!rendered) |
155 PaintFavicon(canvas, *g_default_favicon); | 155 PaintFavicon(canvas, *g_default_favicon); |
156 } | 156 } |
157 | 157 |
158 gfx::Size TabIconView::GetPreferredSize() const { | 158 gfx::Size TabIconView::GetPreferredSize() const { |
159 return gfx::Size(gfx::kFaviconSize, gfx::kFaviconSize); | 159 return gfx::Size(gfx::kFaviconSize, gfx::kFaviconSize); |
160 } | 160 } |
OLD | NEW |