summaryrefslogtreecommitdiffstats
path: root/chrome/browser/favicon
diff options
context:
space:
mode:
authordimich@chromium.org <dimich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-20 18:27:29 +0000
committerdimich@chromium.org <dimich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-20 18:27:29 +0000
commit433bd24b73e676a6aae5b04f00131755cce3552b (patch)
tree5acccf023dff732c2fb4b2c3567e55dbce690fbc /chrome/browser/favicon
parent54bc4441572b798ae75107b32f1bd100335c86d2 (diff)
downloadchromium_src-433bd24b73e676a6aae5b04f00131755cce3552b.zip
chromium_src-433bd24b73e676a6aae5b04f00131755cce3552b.tar.gz
chromium_src-433bd24b73e676a6aae5b04f00131755cce3552b.tar.bz2
Fix Notifications Icon loading.
The recent change to loading favicons regressed the loading regular icons that used the same codepath (https://chromiumcodereview.appspot.com/12218057) The fix is to add a parameter to WebContent::DownloadFavicon(...) to differentiate the loading of favicon and regular images. There is a separate patch, for renaming DownloadFavicon -> DownloadImage (https://codereview.chromium.org/12780024/) TBR=palmer@chromium.org BUG=196769 Review URL: https://codereview.chromium.org/12945007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189349 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/favicon')
-rw-r--r--chrome/browser/favicon/favicon_tab_helper.cc8
1 files changed, 5 insertions, 3 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) {