OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_CORE_FAVICON_DRIVER_IMPL_H_ | 5 #ifndef COMPONENTS_FAVICON_CORE_FAVICON_DRIVER_IMPL_H_ |
6 #define COMPONENTS_FAVICON_CORE_FAVICON_DRIVER_IMPL_H_ | 6 #define COMPONENTS_FAVICON_CORE_FAVICON_DRIVER_IMPL_H_ |
7 | 7 |
| 8 #include <memory> |
8 #include <vector> | 9 #include <vector> |
9 | 10 |
10 #include "base/macros.h" | 11 #include "base/macros.h" |
11 #include "base/memory/scoped_ptr.h" | |
12 #include "components/favicon/core/favicon_driver.h" | 12 #include "components/favicon/core/favicon_driver.h" |
13 | 13 |
14 class GURL; | 14 class GURL; |
15 class SkBitmap; | 15 class SkBitmap; |
16 | 16 |
17 namespace bookmarks { | 17 namespace bookmarks { |
18 class BookmarkModel; | 18 class BookmarkModel; |
19 } | 19 } |
20 | 20 |
21 namespace gfx { | 21 namespace gfx { |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
81 | 81 |
82 private: | 82 private: |
83 // KeyedServices used by FaviconDriverImpl. They may be null during testing, | 83 // KeyedServices used by FaviconDriverImpl. They may be null during testing, |
84 // but if they are defined, they must outlive the FaviconDriverImpl. | 84 // but if they are defined, they must outlive the FaviconDriverImpl. |
85 FaviconService* favicon_service_; | 85 FaviconService* favicon_service_; |
86 history::HistoryService* history_service_; | 86 history::HistoryService* history_service_; |
87 bookmarks::BookmarkModel* bookmark_model_; | 87 bookmarks::BookmarkModel* bookmark_model_; |
88 | 88 |
89 // FaviconHandlers used to download the different kind of favicons. | 89 // FaviconHandlers used to download the different kind of favicons. |
90 // |touch_icon_handler_| may be null depending on the platform and variations. | 90 // |touch_icon_handler_| may be null depending on the platform and variations. |
91 scoped_ptr<FaviconHandler> favicon_handler_; | 91 std::unique_ptr<FaviconHandler> favicon_handler_; |
92 scoped_ptr<FaviconHandler> touch_icon_handler_; | 92 std::unique_ptr<FaviconHandler> touch_icon_handler_; |
93 | 93 |
94 DISALLOW_COPY_AND_ASSIGN(FaviconDriverImpl); | 94 DISALLOW_COPY_AND_ASSIGN(FaviconDriverImpl); |
95 }; | 95 }; |
96 | 96 |
97 } // namespace favicon | 97 } // namespace favicon |
98 | 98 |
99 #endif // COMPONENTS_FAVICON_CORE_FAVICON_DRIVER_IMPL_H_ | 99 #endif // COMPONENTS_FAVICON_CORE_FAVICON_DRIVER_IMPL_H_ |
OLD | NEW |