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 #include "components/favicon/core/favicon_driver_impl.h" | 5 #include "components/favicon/core/favicon_driver_impl.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
9 #include "base/metrics/histogram_macros.h" | 9 #include "base/metrics/histogram_macros.h" |
10 #include "base/strings/string_util.h" | 10 #include "base/strings/string_util.h" |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
96 } | 96 } |
97 } | 97 } |
98 | 98 |
99 void FaviconDriverImpl::OnUpdateCandidates( | 99 void FaviconDriverImpl::OnUpdateCandidates( |
100 const GURL& page_url, | 100 const GURL& page_url, |
101 const std::vector<FaviconURL>& candidates, | 101 const std::vector<FaviconURL>& candidates, |
102 const GURL& manifest_url) { | 102 const GURL& manifest_url) { |
103 RecordCandidateMetrics(candidates); | 103 RecordCandidateMetrics(candidates); |
104 for (const std::unique_ptr<FaviconHandler>& handler : handlers_) { | 104 for (const std::unique_ptr<FaviconHandler>& handler : handlers_) { |
105 // We feed in the Web Manifest URL (if any) to the instance handling type | 105 // We feed in the Web Manifest URL (if any) to the instance handling type |
106 // FAVICON, because those compete which each other (i.e. manifest icons | 106 // WEB_MANIFEST_ICON, because those compete which each other (i.e. manifest |
107 // override inline favicons). | 107 // icons override inline touch icons). |
108 handler->OnUpdateCandidates(page_url, candidates, | 108 handler->OnUpdateCandidates( |
109 handler->icon_types() & favicon_base::FAVICON | 109 page_url, candidates, |
110 ? manifest_url | 110 handler->icon_types() & favicon_base::WEB_MANIFEST_ICON |
111 : GURL::EmptyGURL()); | 111 ? manifest_url |
| 112 : GURL::EmptyGURL()); |
112 } | 113 } |
113 } | 114 } |
114 | 115 |
115 } // namespace favicon | 116 } // namespace favicon |
OLD | NEW |