| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 #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 "app/resource_bundle.h" | 12 #include "app/resource_bundle.h" |
| 13 #include "app/theme_provider.h" | 13 #include "app/theme_provider.h" |
| 14 #include "base/file_util.h" | 14 #include "base/file_util.h" |
| 15 #include "base/logging.h" | 15 #include "base/logging.h" |
| 16 #include "chrome/app/chrome_dll_resource.h" | 16 #include "chrome/app/chrome_command_ids.h" |
| 17 #include "chrome/browser/tab_contents/tab_contents.h" | 17 #include "chrome/browser/tab_contents/tab_contents.h" |
| 18 #include "gfx/canvas.h" | 18 #include "gfx/canvas.h" |
| 19 #include "gfx/favicon_size.h" | 19 #include "gfx/favicon_size.h" |
| 20 #include "grit/app_resources.h" | 20 #include "grit/app_resources.h" |
| 21 #include "grit/theme_resources.h" | 21 #include "grit/theme_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 "gfx/icon_util.h" | 25 #include "gfx/icon_util.h" |
| 26 #endif | 26 #endif |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 } | 147 } |
| 148 } | 148 } |
| 149 | 149 |
| 150 if (!rendered) | 150 if (!rendered) |
| 151 PaintFavIcon(canvas, *g_default_fav_icon); | 151 PaintFavIcon(canvas, *g_default_fav_icon); |
| 152 } | 152 } |
| 153 | 153 |
| 154 gfx::Size TabIconView::GetPreferredSize() { | 154 gfx::Size TabIconView::GetPreferredSize() { |
| 155 return gfx::Size(kFavIconSize, kFavIconSize); | 155 return gfx::Size(kFavIconSize, kFavIconSize); |
| 156 } | 156 } |
| OLD | NEW |