diff options
| author | michaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-16 17:05:30 +0000 |
|---|---|---|
| committer | michaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-16 17:05:30 +0000 |
| commit | 849ccee35b29ff4e6d69766087c0e2d8a2a01004 (patch) | |
| tree | 2d0224faf53752bdda682f78c1a314fcdd2bcf93 /chrome/browser/instant | |
| parent | a9590c25660d4be4caad2add5e16e08003e5ed39 (diff) | |
| download | chromium_src-849ccee35b29ff4e6d69766087c0e2d8a2a01004.zip chromium_src-849ccee35b29ff4e6d69766087c0e2d8a2a01004.tar.gz chromium_src-849ccee35b29ff4e6d69766087c0e2d8a2a01004.tar.bz2 | |
Populated the IconType in FavIconService.
Changed the FavIconService callback to have the IconType parameter.
Changed the callers to use FAV_ICON as default type
BUG=71571
TEST=Tested with existing unit test
Review URL: http://codereview.chromium.org/6651014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78383 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/instant')
| -rw-r--r-- | chrome/browser/instant/instant_loader.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/instant/instant_loader.cc b/chrome/browser/instant/instant_loader.cc index 0194765..c47d916 100644 --- a/chrome/browser/instant/instant_loader.cc +++ b/chrome/browser/instant/instant_loader.cc @@ -320,7 +320,8 @@ void InstantLoader::TabContentsDelegateImpl::CommitHistory( &image_data); favicon_service->SetFavicon(active_entry->url(), active_entry->favicon().url(), - image_data); + image_data, + history::FAVICON); if (supports_instant && !add_page_vector_.empty()) { // If we're using the instant API, then we've tweaked the url that is // going to be added to history. We need to also set the favicon for the @@ -328,7 +329,8 @@ void InstantLoader::TabContentsDelegateImpl::CommitHistory( // for details). favicon_service->SetFavicon(add_page_vector_.back()->url, active_entry->favicon().url(), - image_data); + image_data, + history::FAVICON); } } } |