diff options
Diffstat (limited to 'chrome')
8 files changed, 17 insertions, 8 deletions
diff --git a/chrome/browser/favicon/favicon_tab_helper.cc b/chrome/browser/favicon/favicon_tab_helper.cc index 9163926..8d17dcd 100644 --- a/chrome/browser/favicon/favicon_tab_helper.cc +++ b/chrome/browser/favicon/favicon_tab_helper.cc @@ -132,9 +132,11 @@ NavigationEntry* FaviconTabHelper::GetActiveEntry() { } int FaviconTabHelper::StartDownload(const GURL& url, int image_size) { - return web_contents()->DownloadFavicon(url, image_size, - base::Bind(&FaviconTabHelper::DidDownloadFavicon, - base::Unretained(this))); + return web_contents()->DownloadFavicon( + url, + true, + image_size, + base::Bind(&FaviconTabHelper::DidDownloadFavicon,base::Unretained(this))); } void FaviconTabHelper::NotifyFaviconUpdated(bool icon_url_changed) { diff --git a/chrome/browser/notifications/message_center_notification_manager.cc b/chrome/browser/notifications/message_center_notification_manager.cc index 5d9749e..5296aed 100644 --- a/chrome/browser/notifications/message_center_notification_manager.cc +++ b/chrome/browser/notifications/message_center_notification_manager.cc @@ -308,6 +308,7 @@ void MessageCenterNotificationManager::ImageDownloads::StartDownloadWithImage( contents->DownloadFavicon( url, + false, size, base::Bind( &MessageCenterNotificationManager::ImageDownloads::DownloadComplete, diff --git a/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc b/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc index c30bbb2..19f3dff 100644 --- a/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc +++ b/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc @@ -109,7 +109,7 @@ void FaviconBitmapHandler::DidUpdateFaviconURL( if (pending_requests_.find(*iter) != pending_requests_.end()) continue; // Skip already pending downloads. pending_requests_.insert(*iter); - web_contents_->DownloadFavicon(*iter, 0, + web_contents_->DownloadFavicon(*iter, true, 0, base::Bind(&FaviconBitmapHandler::DidDownloadFavicon, weak_ptr_factory_.GetWeakPtr())); } diff --git a/chrome/browser/ui/extensions/shell_window.cc b/chrome/browser/ui/extensions/shell_window.cc index ee33206..4303c5f 100644 --- a/chrome/browser/ui/extensions/shell_window.cc +++ b/chrome/browser/ui/extensions/shell_window.cc @@ -361,7 +361,7 @@ void ShellWindow::SetAppIconUrl(const GURL& url) { app_icon_url_ = url; web_contents()->DownloadFavicon( - url, kPreferredIconSize, + url, true, kPreferredIconSize, base::Bind(&ShellWindow::DidDownloadFavicon, image_loader_ptr_factory_.GetWeakPtr())); } diff --git a/chrome/browser/ui/metro_pin_tab_helper_win.cc b/chrome/browser/ui/metro_pin_tab_helper_win.cc index f5078f3..fc0e13c7 100644 --- a/chrome/browser/ui/metro_pin_tab_helper_win.cc +++ b/chrome/browser/ui/metro_pin_tab_helper_win.cc @@ -400,7 +400,9 @@ void MetroPinTabHelper::TogglePinnedToStartScreen() { iter != favicon_url_candidates_.end(); ++iter) { favicon_chooser_->AddPendingRequest( - web_contents()->DownloadFavicon(iter->icon_url, image_size, + web_contents()->DownloadFavicon(iter->icon_url, + true, + image_size, base::Bind(&MetroPinTabHelper::DidDownloadFavicon, base::Unretained(this)))); } diff --git a/chrome/browser/ui/views/ash/balloon_view_ash.cc b/chrome/browser/ui/views/ash/balloon_view_ash.cc index a9cb9d7..acebcc9 100644 --- a/chrome/browser/ui/views/ash/balloon_view_ash.cc +++ b/chrome/browser/ui/views/ash/balloon_view_ash.cc @@ -89,8 +89,10 @@ BalloonViewAsh::ImageDownload::ImageDownload(const Notification& notification, return; } - contents->DownloadFavicon(url_, size_, base::Bind(&ImageDownload::Downloaded, - AsWeakPtr())); + contents->DownloadFavicon(url_, + false, + size_, + base::Bind(&ImageDownload::Downloaded,AsWeakPtr())); } diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc index 1d27d3a..bd06c58 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.cc +++ b/chrome/browser/ui/views/create_application_shortcut_view.cc @@ -492,6 +492,7 @@ void CreateUrlApplicationShortcutView::FetchIcon() { pending_download_id_ = web_contents_->DownloadFavicon( unprocessed_icons_.back().url, + true, std::max(unprocessed_icons_.back().width, unprocessed_icons_.back().height), base::Bind(&CreateUrlApplicationShortcutView::DidDownloadFavicon, diff --git a/chrome/browser/ui/web_applications/web_app_ui.cc b/chrome/browser/ui/web_applications/web_app_ui.cc index 34ad3d0..cfe3c09 100644 --- a/chrome/browser/ui/web_applications/web_app_ui.cc +++ b/chrome/browser/ui/web_applications/web_app_ui.cc @@ -172,6 +172,7 @@ void UpdateShortcutWorker::DownloadIcon() { web_contents_->DownloadFavicon( unprocessed_icons_.back().url, + true, // favicon std::max(unprocessed_icons_.back().width, unprocessed_icons_.back().height), base::Bind(&UpdateShortcutWorker::DidDownloadFavicon, |