OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/favicon/favicon_tab_helper.h" | 5 #include "chrome/browser/favicon/favicon_tab_helper.h" |
6 | 6 |
7 #include "chrome/browser/favicon/favicon_handler.h" | 7 #include "chrome/browser/favicon/favicon_handler.h" |
8 #include "chrome/browser/favicon/favicon_service_factory.h" | 8 #include "chrome/browser/favicon/favicon_service_factory.h" |
9 #include "chrome/browser/favicon/favicon_util.h" | 9 #include "chrome/browser/favicon/favicon_util.h" |
10 #include "chrome/browser/history/history.h" | 10 #include "chrome/browser/history/history.h" |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
159 int32 page_id, | 159 int32 page_id, |
160 const std::vector<content::FaviconURL>& candidates) { | 160 const std::vector<content::FaviconURL>& candidates) { |
161 favicon_handler_->OnUpdateFaviconURL(page_id, candidates); | 161 favicon_handler_->OnUpdateFaviconURL(page_id, candidates); |
162 if (touch_icon_handler_.get()) | 162 if (touch_icon_handler_.get()) |
163 touch_icon_handler_->OnUpdateFaviconURL(page_id, candidates); | 163 touch_icon_handler_->OnUpdateFaviconURL(page_id, candidates); |
164 } | 164 } |
165 | 165 |
166 void FaviconTabHelper::DidDownloadFavicon( | 166 void FaviconTabHelper::DidDownloadFavicon( |
167 int id, | 167 int id, |
168 const GURL& image_url, | 168 const GURL& image_url, |
169 bool errored, | |
170 int requested_size, | 169 int requested_size, |
171 const std::vector<SkBitmap>& bitmaps) { | 170 const std::vector<SkBitmap>& bitmaps) { |
172 favicon_handler_->OnDidDownloadFavicon( | 171 favicon_handler_->OnDidDownloadFavicon( |
173 id, image_url, errored, requested_size, bitmaps); | 172 id, image_url, requested_size, bitmaps); |
174 if (touch_icon_handler_.get()) { | 173 if (touch_icon_handler_.get()) { |
175 touch_icon_handler_->OnDidDownloadFavicon( | 174 touch_icon_handler_->OnDidDownloadFavicon( |
176 id, image_url, errored, requested_size, bitmaps); | 175 id, image_url, requested_size, bitmaps); |
177 } | 176 } |
178 } | 177 } |
OLD | NEW |