| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_TYPES_H_ | 5 #ifndef CHROME_COMMON_FAVICON_FAVICON_TYPES_H_ |
| 6 #define CHROME_BROWSER_FAVICON_FAVICON_TYPES_H_ | 6 #define CHROME_COMMON_FAVICON_FAVICON_TYPES_H_ |
| 7 | 7 |
| 8 #include "base/memory/ref_counted_memory.h" | 8 #include "base/memory/ref_counted_memory.h" |
| 9 #include "chrome/common/favicon/favicon_types.h" |
| 9 #include "ui/gfx/image/image.h" | 10 #include "ui/gfx/image/image.h" |
| 10 #include "ui/gfx/size.h" | 11 #include "ui/gfx/size.h" |
| 11 #include "url/gurl.h" | 12 #include "url/gurl.h" |
| 12 | 13 |
| 13 namespace chrome { | 14 namespace chrome { |
| 14 | 15 |
| 15 typedef int64 FaviconID; | 16 typedef int64 FaviconID; |
| 16 | 17 |
| 17 // Defines the icon types. They are also stored in icon_type field of favicons | 18 // Defines the icon types. They are also stored in icon_type field of favicons |
| 18 // table. | 19 // table. |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 // The icon type of the containing favicon. | 68 // The icon type of the containing favicon. |
| 68 IconType icon_type; | 69 IconType icon_type; |
| 69 }; | 70 }; |
| 70 | 71 |
| 71 // Define type with same structure as FaviconBitmapResult for passing data to | 72 // Define type with same structure as FaviconBitmapResult for passing data to |
| 72 // HistoryBackend::SetFavicons(). | 73 // HistoryBackend::SetFavicons(). |
| 73 typedef FaviconBitmapResult FaviconBitmapData; | 74 typedef FaviconBitmapResult FaviconBitmapData; |
| 74 | 75 |
| 75 } // namespace chrome | 76 } // namespace chrome |
| 76 | 77 |
| 77 #endif // CHROME_BROWSER_FAVICON_FAVICON_TYPES_H_ | 78 #endif // CHROME_COMMON_FAVICON_FAVICON_TYPES_H_ |
| OLD | NEW |