Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(485)

Side by Side Diff: components/favicon/core/favicon_driver_impl.h

Issue 2795763004: Treat touch icons just like non-touch icons on mobile
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <memory>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 FaviconService* favicon_service() { return favicon_service_; } 68 FaviconService* favicon_service() { return favicon_service_; }
69 69
70 private: 70 private:
71 // KeyedServices used by FaviconDriverImpl. They may be null during testing, 71 // KeyedServices used by FaviconDriverImpl. They may be null during testing,
72 // but if they are defined, they must outlive the FaviconDriverImpl. 72 // but if they are defined, they must outlive the FaviconDriverImpl.
73 FaviconService* favicon_service_; 73 FaviconService* favicon_service_;
74 history::HistoryService* history_service_; 74 history::HistoryService* history_service_;
75 bookmarks::BookmarkModel* bookmark_model_; 75 bookmarks::BookmarkModel* bookmark_model_;
76 76
77 // FaviconHandlers used to download the different kind of favicons. 77 // FaviconHandlers used to download the different kind of favicons.
78 // |touch_icon_handler_| may be null depending on the platform and variations.
79 std::unique_ptr<FaviconHandler> favicon_handler_; 78 std::unique_ptr<FaviconHandler> favicon_handler_;
80 std::unique_ptr<FaviconHandler> touch_icon_handler_;
81 79
82 DISALLOW_COPY_AND_ASSIGN(FaviconDriverImpl); 80 DISALLOW_COPY_AND_ASSIGN(FaviconDriverImpl);
83 }; 81 };
84 82
85 } // namespace favicon 83 } // namespace favicon
86 84
87 #endif // COMPONENTS_FAVICON_CORE_FAVICON_DRIVER_IMPL_H_ 85 #endif // COMPONENTS_FAVICON_CORE_FAVICON_DRIVER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698