Index: chrome/browser/ui/ash/launcher/browser_launcher_item_controller.cc |
diff --git a/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.cc |
index b473e2b2d344d4698995c0e9f616103d335a7299..0bcf5a4b6fa6e883b7285712e4bd6ea9100e433d 100644 |
--- a/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.cc |
+++ b/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.cc |
@@ -227,10 +227,9 @@ void BrowserLauncherItemController::UpdateLauncher(TabContents* tab) { |
DCHECK_EQ(TYPE_TABBED, type_); |
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); |
if (tab->favicon_tab_helper()->ShouldDisplayFavicon()) { |
- item.image = tab->favicon_tab_helper()->GetFavicon().AsBitmap(); |
- if (item.image.empty()) { |
- item.image = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON); |
- } |
+ const gfx::Image& icon = tab->favicon_tab_helper()->GetFavicon(); |
+ item.image = icon.IsEmpty() ? *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON) : |
+ *icon.ToSkBitmap(); |
} else { |
item.image = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON); |
} |