| Index: chrome/browser/tab_contents/tab_contents.cc
|
| ===================================================================
|
| --- chrome/browser/tab_contents/tab_contents.cc (revision 27368)
|
| +++ chrome/browser/tab_contents/tab_contents.cc (working copy)
|
| @@ -535,6 +535,18 @@
|
| return SkBitmap();
|
| }
|
|
|
| +bool TabContents::FavIconIsValid() const {
|
| + NavigationEntry* entry = controller_.GetTransientEntry();
|
| + if (entry)
|
| + return entry->favicon().is_valid();
|
| +
|
| + entry = controller_.GetLastCommittedEntry();
|
| + if (entry)
|
| + return entry->favicon().is_valid();
|
| +
|
| + return false;
|
| +}
|
| +
|
| bool TabContents::ShouldDisplayFavIcon() {
|
| // Always display a throbber during pending loads.
|
| if (controller_.GetLastCommittedEntry() && controller_.pending_entry())
|
| @@ -767,8 +779,11 @@
|
| return;
|
|
|
| #if defined(OS_LINUX) && !defined(TOOLKIT_VIEWS)
|
| + SkBitmap bitmap;
|
| + if (FavIconIsValid())
|
| + bitmap = GetFavIcon();
|
| CreateApplicationShortcutsDialogGtk::Show(view()->GetTopLevelNativeWindow(),
|
| - GetURL(), GetTitle());
|
| + GetURL(), GetTitle(), bitmap);
|
| #else
|
| // We only allow one pending install request. By resetting the page id we
|
| // effectively cancel the pending install request.
|
|
|