OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 COMPONENTS_FAVICON_BASE_FAVICON_TYPES_H_ | 5 #ifndef COMPONENTS_FAVICON_BASE_FAVICON_TYPES_H_ |
6 #define COMPONENTS_FAVICON_BASE_FAVICON_TYPES_H_ | 6 #define COMPONENTS_FAVICON_BASE_FAVICON_TYPES_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
| 10 #include <memory> |
| 11 |
10 #include "base/memory/ref_counted_memory.h" | 12 #include "base/memory/ref_counted_memory.h" |
11 #include "base/memory/scoped_ptr.h" | |
12 #include "ui/gfx/geometry/size.h" | 13 #include "ui/gfx/geometry/size.h" |
13 #include "ui/gfx/image/image.h" | 14 #include "ui/gfx/image/image.h" |
14 #include "url/gurl.h" | 15 #include "url/gurl.h" |
15 | 16 |
16 namespace favicon_base { | 17 namespace favicon_base { |
17 | 18 |
18 struct FallbackIconStyle; | 19 struct FallbackIconStyle; |
19 | 20 |
20 typedef int64_t FaviconID; | 21 typedef int64_t FaviconID; |
21 | 22 |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
88 explicit LargeIconResult(FallbackIconStyle* fallback_icon_style_in); | 89 explicit LargeIconResult(FallbackIconStyle* fallback_icon_style_in); |
89 | 90 |
90 ~LargeIconResult(); | 91 ~LargeIconResult(); |
91 | 92 |
92 // The bitmap from the favicon database if the database has a sufficiently | 93 // The bitmap from the favicon database if the database has a sufficiently |
93 // large one. | 94 // large one. |
94 FaviconRawBitmapResult bitmap; | 95 FaviconRawBitmapResult bitmap; |
95 | 96 |
96 // The fallback icon style if a sufficiently large icon isn't available. This | 97 // The fallback icon style if a sufficiently large icon isn't available. This |
97 // uses the dominant color of a smaller icon as the background if available. | 98 // uses the dominant color of a smaller icon as the background if available. |
98 scoped_ptr<FallbackIconStyle> fallback_icon_style; | 99 std::unique_ptr<FallbackIconStyle> fallback_icon_style; |
99 }; | 100 }; |
100 | 101 |
101 } // namespace favicon_base | 102 } // namespace favicon_base |
102 | 103 |
103 #endif // COMPONENTS_FAVICON_BASE_FAVICON_TYPES_H_ | 104 #endif // COMPONENTS_FAVICON_BASE_FAVICON_TYPES_H_ |
OLD | NEW |