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

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

Issue 1118073002: Simplify FaviconDriverImpl by removing extra FaviconHandler member. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 <vector> 8 #include <vector>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 // Broadcasts new favicon URL candidates to FaviconHandlers. 76 // Broadcasts new favicon URL candidates to FaviconHandlers.
77 void OnUpdateFaviconURL(const std::vector<FaviconURL>& candidates); 77 void OnUpdateFaviconURL(const std::vector<FaviconURL>& candidates);
78 78
79 private: 79 private:
80 // KeyedServices used by FaviconDriverImpl. They may be null during testing, 80 // KeyedServices used by FaviconDriverImpl. They may be null during testing,
81 // but if they are defined, they must outlive the FaviconDriverImpl. 81 // but if they are defined, they must outlive the FaviconDriverImpl.
82 FaviconService* favicon_service_; 82 FaviconService* favicon_service_;
83 history::HistoryService* history_service_; 83 history::HistoryService* history_service_;
84 bookmarks::BookmarkModel* bookmark_model_; 84 bookmarks::BookmarkModel* bookmark_model_;
85 85
86 // FaviconHandlers used to download the different kind of favicons. Both 86 // FaviconHandlers used to download the different kind of favicons. The
87 // |touch_icon_handler_| and |large_icon_handler_| may be null depending 87 // |touch_icon_handler_| may be null depending on the platform and variations.
88 // on the platform or variations.
89 scoped_ptr<FaviconHandler> favicon_handler_; 88 scoped_ptr<FaviconHandler> favicon_handler_;
90 scoped_ptr<FaviconHandler> touch_icon_handler_; 89 scoped_ptr<FaviconHandler> touch_icon_handler_;
91 scoped_ptr<FaviconHandler> large_icon_handler_;
92 90
93 DISALLOW_COPY_AND_ASSIGN(FaviconDriverImpl); 91 DISALLOW_COPY_AND_ASSIGN(FaviconDriverImpl);
94 }; 92 };
95 93
96 } // namespace favicon 94 } // namespace favicon
97 95
98 #endif // COMPONENTS_FAVICON_CORE_FAVICON_DRIVER_IMPL_H_ 96 #endif // COMPONENTS_FAVICON_CORE_FAVICON_DRIVER_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | components/favicon/core/favicon_driver_impl.cc » ('j') | components/favicon/core/favicon_handler.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698