OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_COMMON_FAVICON_URL_H_ | 5 #ifndef CONTENT_PUBLIC_COMMON_FAVICON_URL_H_ |
6 #define CONTENT_PUBLIC_COMMON_FAVICON_URL_H_ | 6 #define CONTENT_PUBLIC_COMMON_FAVICON_URL_H_ |
7 | 7 |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "content/common/content_export.h" | 10 #include "content/common/content_export.h" |
11 #include "ui/gfx/geometry/size.h" | 11 #include "ui/gfx/geometry/size.h" |
12 #include "url/gurl.h" | 12 #include "url/gurl.h" |
13 | 13 |
14 namespace content { | 14 namespace content { |
15 | 15 |
16 // The favicon url from the render. | 16 // The favicon url from the render. |
17 struct CONTENT_EXPORT FaviconURL { | 17 struct CONTENT_EXPORT FaviconURL { |
18 // The icon type in a page. The definition must be same as | 18 // The icon type in a page. The definition must be same as |
19 // favicon_base::IconType. | 19 // favicon_base::IconType. |
20 enum IconType { | 20 enum class IconType { |
21 INVALID_ICON = 0x0, | 21 kInvalid, |
22 FAVICON = 1 << 0, | 22 kFavicon, |
23 TOUCH_ICON = 1 << 1, | 23 kTouchIcon, |
24 TOUCH_PRECOMPOSED_ICON = 1 << 2 | 24 kTouchPrecomposedIcon, |
| 25 kMax = kTouchPrecomposedIcon, |
25 }; | 26 }; |
26 | 27 |
27 FaviconURL(); | 28 FaviconURL(); |
28 FaviconURL(const GURL& url, | 29 FaviconURL(const GURL& url, |
29 IconType type, | 30 IconType type, |
30 const std::vector<gfx::Size>& sizes); | 31 const std::vector<gfx::Size>& sizes); |
31 FaviconURL(const FaviconURL& other); | 32 FaviconURL(const FaviconURL& other); |
32 ~FaviconURL(); | 33 ~FaviconURL(); |
33 | 34 |
34 // The url of the icon. | 35 // The url of the icon. |
35 GURL icon_url; | 36 GURL icon_url; |
36 | 37 |
37 // The type of the icon | 38 // The type of the icon |
38 IconType icon_type; | 39 IconType icon_type; |
39 | 40 |
40 // Icon's bitmaps' size | 41 // Icon's bitmaps' size |
41 std::vector<gfx::Size> icon_sizes; | 42 std::vector<gfx::Size> icon_sizes; |
42 }; | 43 }; |
43 | 44 |
44 } // namespace content | 45 } // namespace content |
45 | 46 |
46 #endif // CONTENT_PUBLIC_COMMON_FAVICON_URL_H_ | 47 #endif // CONTENT_PUBLIC_COMMON_FAVICON_URL_H_ |
OLD | NEW |