| 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 CONTENT_PUBLIC_BROWSER_FAVICON_STATUS_H_ | 5 #ifndef CONTENT_PUBLIC_BROWSER_FAVICON_STATUS_H_ |
| 6 #define CONTENT_PUBLIC_BROWSER_FAVICON_STATUS_H_ | 6 #define CONTENT_PUBLIC_BROWSER_FAVICON_STATUS_H_ |
| 7 | 7 |
| 8 #include "content/common/content_export.h" | 8 #include "content/common/content_export.h" |
| 9 #include "googleurl/src/gurl.h" | 9 #include "googleurl/src/gurl.h" |
| 10 #include "ui/gfx/image/image.h" | 10 #include "ui/gfx/image/image.h" |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 | 22 |
| 23 // The URL of the favicon which was used to load it off the web. | 23 // The URL of the favicon which was used to load it off the web. |
| 24 GURL url; | 24 GURL url; |
| 25 | 25 |
| 26 // The favicon bitmap for the page. If the favicon has not been explicitly | 26 // The favicon bitmap for the page. If the favicon has not been explicitly |
| 27 // set or it empty, it will return the default favicon. Note that this is | 27 // set or it empty, it will return the default favicon. Note that this is |
| 28 // loaded asynchronously, so even if the favicon URL is valid we may return | 28 // loaded asynchronously, so even if the favicon URL is valid we may return |
| 29 // the default favicon if we haven't gotten the data yet. | 29 // the default favicon if we haven't gotten the data yet. |
| 30 gfx::Image image; | 30 gfx::Image image; |
| 31 | 31 |
| 32 // Returns 1x resolution of image. This function should eventually go away. | |
| 33 SkBitmap AsBitmap() const; | |
| 34 | |
| 35 // Copy and assignment is explicitly allowed for this struct. | 32 // Copy and assignment is explicitly allowed for this struct. |
| 36 }; | 33 }; |
| 37 | 34 |
| 38 } // namespace content | 35 } // namespace content |
| 39 | 36 |
| 40 #endif // CONTENT_PUBLIC_BROWSER_FAVICON_STATUS_H_ | 37 #endif // CONTENT_PUBLIC_BROWSER_FAVICON_STATUS_H_ |
| OLD | NEW |