| 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 "build/build_config.h" |
| 14 #include "chrome/app/chrome_command_ids.h" | 15 #include "chrome/app/chrome_command_ids.h" |
| 15 #include "chrome/browser/ui/views/tab_icon_view_model.h" | 16 #include "chrome/browser/ui/views/tab_icon_view_model.h" |
| 16 #include "grit/theme_resources.h" | 17 #include "grit/theme_resources.h" |
| 17 #include "ui/base/resource/resource_bundle.h" | 18 #include "ui/base/resource/resource_bundle.h" |
| 18 #include "ui/base/theme_provider.h" | 19 #include "ui/base/theme_provider.h" |
| 19 #include "ui/gfx/canvas.h" | 20 #include "ui/gfx/canvas.h" |
| 20 #include "ui/gfx/favicon_size.h" | 21 #include "ui/gfx/favicon_size.h" |
| 21 #include "ui/gfx/paint_throbber.h" | 22 #include "ui/gfx/paint_throbber.h" |
| 22 #include "ui/native_theme/native_theme.h" | 23 #include "ui/native_theme/native_theme.h" |
| 23 #include "ui/resources/grit/ui_resources.h" | 24 #include "ui/resources/grit/ui_resources.h" |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 gfx::ImageSkia favicon = model_->GetFaviconForTabIconView(); | 131 gfx::ImageSkia favicon = model_->GetFaviconForTabIconView(); |
| 131 if (!favicon.isNull()) { | 132 if (!favicon.isNull()) { |
| 132 rendered = true; | 133 rendered = true; |
| 133 PaintFavicon(canvas, favicon); | 134 PaintFavicon(canvas, favicon); |
| 134 } | 135 } |
| 135 } | 136 } |
| 136 | 137 |
| 137 if (!rendered) | 138 if (!rendered) |
| 138 PaintFavicon(canvas, *g_default_favicon); | 139 PaintFavicon(canvas, *g_default_favicon); |
| 139 } | 140 } |
| OLD | NEW |