| 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/file_util.h" | 12 #include "base/file_util.h" |
| 13 #include "base/logging.h" | 13 #include "base/logging.h" |
| 14 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
| 15 #include "chrome/app/chrome_command_ids.h" | 15 #include "chrome/app/chrome_command_ids.h" |
| 16 #include "grit/theme_resources.h" | 16 #include "grit/theme_resources.h" |
| 17 #include "grit/theme_resources_standard.h" |
| 17 #include "grit/ui_resources.h" | 18 #include "grit/ui_resources.h" |
| 18 #include "grit/ui_resources_standard.h" | 19 #include "grit/ui_resources_standard.h" |
| 19 #include "ui/base/resource/resource_bundle.h" | 20 #include "ui/base/resource/resource_bundle.h" |
| 20 #include "ui/base/theme_provider.h" | 21 #include "ui/base/theme_provider.h" |
| 21 #include "ui/gfx/canvas.h" | 22 #include "ui/gfx/canvas.h" |
| 22 #include "ui/gfx/favicon_size.h" | 23 #include "ui/gfx/favicon_size.h" |
| 23 | 24 |
| 24 #if defined(OS_WIN) | 25 #if defined(OS_WIN) |
| 25 #include "chrome/browser/app_icon_win.h" | 26 #include "chrome/browser/app_icon_win.h" |
| 26 #include "ui/gfx/icon_util.h" | 27 #include "ui/gfx/icon_util.h" |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 } | 150 } |
| 150 } | 151 } |
| 151 | 152 |
| 152 if (!rendered) | 153 if (!rendered) |
| 153 PaintFavicon(canvas, *g_default_favicon); | 154 PaintFavicon(canvas, *g_default_favicon); |
| 154 } | 155 } |
| 155 | 156 |
| 156 gfx::Size TabIconView::GetPreferredSize() { | 157 gfx::Size TabIconView::GetPreferredSize() { |
| 157 return gfx::Size(gfx::kFaviconSize, gfx::kFaviconSize); | 158 return gfx::Size(gfx::kFaviconSize, gfx::kFaviconSize); |
| 158 } | 159 } |
| OLD | NEW |