Chromium Code Reviews| 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 #ifndef CHROME_BROWSER_FAVICON_FAVICON_HANDLER_H_ | 5 #ifndef CHROME_BROWSER_FAVICON_FAVICON_HANDLER_H_ |
| 6 #define CHROME_BROWSER_FAVICON_FAVICON_HANDLER_H_ | 6 #define CHROME_BROWSER_FAVICON_FAVICON_HANDLER_H_ |
| 7 | 7 |
| 8 #include <deque> | 8 #include <deque> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 219 const gfx::Image& image, | 219 const gfx::Image& image, |
| 220 float score, | 220 float score, |
| 221 favicon_base::IconType icon_type); | 221 favicon_base::IconType icon_type); |
| 222 | 222 |
| 223 // Sets the image data for the favicon. | 223 // Sets the image data for the favicon. |
| 224 void SetFavicon(const GURL& url, | 224 void SetFavicon(const GURL& url, |
| 225 const GURL& icon_url, | 225 const GURL& icon_url, |
| 226 const gfx::Image& image, | 226 const gfx::Image& image, |
| 227 favicon_base::IconType icon_type); | 227 favicon_base::IconType icon_type); |
| 228 | 228 |
| 229 // Sets the favicon's data. | 229 // Sets the favicon's data. |
|
sky
2014/10/30 03:34:31
update comment.
michaelbai
2014/10/30 19:22:50
Done.
| |
| 230 void SetFaviconOnActivePage(const std::vector< | 230 gfx::Image SelectFaviconFrames(const std::vector< |
| 231 favicon_base::FaviconRawBitmapResult>& favicon_bitmap_results); | 231 favicon_base::FaviconRawBitmapResult>& favicon_bitmap_results); |
| 232 void SetFaviconOnActivePage(const GURL& icon_url, const gfx::Image& image); | 232 void SetFaviconOnActivePage(const GURL& icon_url, const gfx::Image& image); |
| 233 | 233 |
| 234 // Return the current candidate if any. | 234 // Return the current candidate if any. |
| 235 favicon::FaviconURL* current_candidate() { | 235 favicon::FaviconURL* current_candidate() { |
| 236 return (!image_urls_.empty()) ? &image_urls_.front() : NULL; | 236 return (!image_urls_.empty()) ? &image_urls_.front() : NULL; |
| 237 } | 237 } |
| 238 | 238 |
| 239 // Returns whether the page's url changed since the favicon was requested. | 239 // Returns whether the page's url changed since the favicon was requested. |
| 240 bool PageChangedSinceFaviconWasRequested(); | 240 bool PageChangedSinceFaviconWasRequested(); |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 292 // Best image we've seen so far. As images are downloaded from the page they | 292 // Best image we've seen so far. As images are downloaded from the page they |
| 293 // are stored here. When there is an exact match, or no more images are | 293 // are stored here. When there is an exact match, or no more images are |
| 294 // available the favicon service and the current page are updated (assuming | 294 // available the favicon service and the current page are updated (assuming |
| 295 // the image is for a favicon). | 295 // the image is for a favicon). |
| 296 FaviconCandidate best_favicon_candidate_; | 296 FaviconCandidate best_favicon_candidate_; |
| 297 | 297 |
| 298 DISALLOW_COPY_AND_ASSIGN(FaviconHandler); | 298 DISALLOW_COPY_AND_ASSIGN(FaviconHandler); |
| 299 }; | 299 }; |
| 300 | 300 |
| 301 #endif // CHROME_BROWSER_FAVICON_FAVICON_HANDLER_H_ | 301 #endif // CHROME_BROWSER_FAVICON_FAVICON_HANDLER_H_ |
| OLD | NEW |