Index: chrome/browser/ui/views/location_bar/location_bar_view.cc |
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc |
index 0bbcb84135bdfc9945bad72d45e52f4858ea13f8..e5ddf7d5c6b624097930e43034f67f08cf8b6a77 100644 |
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc |
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc |
@@ -1049,8 +1049,9 @@ void LocationBarView::OnSetFocus() { |
} |
SkBitmap LocationBarView::GetFavicon() const { |
- return delegate_->GetTabContents()->favicon_tab_helper()-> |
- GetFavicon().AsBitmap(); |
+ const gfx::Image& icon = delegate_->GetTabContents()-> |
+ favicon_tab_helper()->GetFavicon(); |
+ return icon.IsEmpty() ? SkBitmap() : *icon.ToSkBitmap(); |
} |
string16 LocationBarView::GetTitle() const { |
@@ -1277,8 +1278,9 @@ void LocationBarView::WriteDragDataForView(views::View* sender, |
TabContents* tab_contents = GetTabContents(); |
DCHECK(tab_contents); |
+ const gfx::Image& icon = tab_contents->favicon_tab_helper()->GetFavicon(); |
gfx::ImageSkia favicon = |
- tab_contents->favicon_tab_helper()->GetFavicon().AsImageSkia(); |
+ icon.IsEmpty() ? gfx::ImageSkia() : *icon.ToImageSkia(); |
button_drag_utils::SetURLAndDragImage( |
tab_contents->web_contents()->GetURL(), |
tab_contents->web_contents()->GetTitle(), |