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

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

Issue 2891333002: Introduce dedicated enum value for icons from Web Manifests (Closed)
Patch Set: Updated iOS code. Created 3 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 #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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 // FAVICON, because those compete which each other (i.e. manifest icons
107 // override inline favicons). 107 // override inline favicons).
pkotwicz 2017/05/26 14:49:56 You need to update this comment
mastiz 2017/05/26 18:30:25 Done.
108 handler->OnUpdateCandidates(page_url, candidates, 108 handler->OnUpdateCandidates(page_url, candidates,
109 handler->icon_types() & favicon_base::FAVICON 109 handler->icon_types() & favicon_base::TOUCH_ICON
pkotwicz 2017/05/26 14:49:56 Might as well make this WEB_MANIFEST_ICON
mastiz 2017/05/26 18:30:25 Done.
110 ? manifest_url 110 ? manifest_url
111 : GURL::EmptyGURL()); 111 : GURL::EmptyGURL());
112 } 112 }
113 } 113 }
114 114
115 } // namespace favicon 115 } // namespace favicon
OLDNEW
« no previous file with comments | « components/favicon/content/content_favicon_driver.cc ('k') | components/favicon/core/favicon_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698