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

Side by Side Diff: components/favicon/ios/favicon_url_util.cc

Issue 2891333002: Introduce dedicated enum value for icons from Web Manifests (Closed)
Patch Set: Put browsertest behind #if. Created 3 years, 6 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
« no previous file with comments | « components/favicon/core/large_icon_service.cc ('k') | components/favicon_base/favicon_types.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/ios/favicon_url_util.h" 5 #include "components/favicon/ios/favicon_url_util.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 9
10 #include "components/favicon/core/favicon_url.h" 10 #include "components/favicon/core/favicon_url.h"
11 #include "components/favicon_base/favicon_types.h" 11 #include "components/favicon_base/favicon_types.h"
12 #include "ios/web/public/favicon_url.h" 12 #include "ios/web/public/favicon_url.h"
13 13
14 namespace favicon { 14 namespace favicon {
15 namespace { 15 namespace {
16 16
17 favicon_base::IconType IconTypeFromWebIconType( 17 favicon_base::IconType IconTypeFromWebIconType(
18 web::FaviconURL::IconType icon_type) { 18 web::FaviconURL::IconType icon_type) {
19 switch (icon_type) { 19 switch (icon_type) {
20 case web::FaviconURL::FAVICON: 20 case web::FaviconURL::FAVICON:
21 return favicon_base::FAVICON; 21 return favicon_base::FAVICON;
22 case web::FaviconURL::TOUCH_ICON: 22 case web::FaviconURL::TOUCH_ICON:
23 return favicon_base::TOUCH_ICON; 23 return favicon_base::TOUCH_ICON;
24 case web::FaviconURL::TOUCH_PRECOMPOSED_ICON: 24 case web::FaviconURL::TOUCH_PRECOMPOSED_ICON:
25 return favicon_base::TOUCH_PRECOMPOSED_ICON; 25 return favicon_base::TOUCH_PRECOMPOSED_ICON;
26 case web::FaviconURL::WEB_MANIFEST_ICON:
27 return favicon_base::WEB_MANIFEST_ICON;
26 case web::FaviconURL::INVALID_ICON: 28 case web::FaviconURL::INVALID_ICON:
27 return favicon_base::INVALID_ICON; 29 return favicon_base::INVALID_ICON;
28 } 30 }
29 NOTREACHED(); 31 NOTREACHED();
30 return favicon_base::INVALID_ICON; 32 return favicon_base::INVALID_ICON;
31 } 33 }
32 34
33 } // namespace 35 } // namespace
34 36
35 FaviconURL FaviconURLFromWebFaviconURL( 37 FaviconURL FaviconURLFromWebFaviconURL(
36 const web::FaviconURL& favicon_url) { 38 const web::FaviconURL& favicon_url) {
37 return FaviconURL(favicon_url.icon_url, 39 return FaviconURL(favicon_url.icon_url,
38 IconTypeFromWebIconType(favicon_url.icon_type), 40 IconTypeFromWebIconType(favicon_url.icon_type),
39 favicon_url.icon_sizes); 41 favicon_url.icon_sizes);
40 } 42 }
41 43
42 std::vector<FaviconURL> FaviconURLsFromWebFaviconURLs( 44 std::vector<FaviconURL> FaviconURLsFromWebFaviconURLs(
43 const std::vector<web::FaviconURL>& favicon_urls) { 45 const std::vector<web::FaviconURL>& favicon_urls) {
44 std::vector<FaviconURL> result; 46 std::vector<FaviconURL> result;
45 result.reserve(favicon_urls.size()); 47 result.reserve(favicon_urls.size());
46 std::transform(favicon_urls.begin(), favicon_urls.end(), 48 std::transform(favicon_urls.begin(), favicon_urls.end(),
47 std::back_inserter(result), FaviconURLFromWebFaviconURL); 49 std::back_inserter(result), FaviconURLFromWebFaviconURL);
48 return result; 50 return result;
49 } 51 }
50 52
51 } // namespace favicon 53 } // namespace favicon
OLDNEW
« no previous file with comments | « components/favicon/core/large_icon_service.cc ('k') | components/favicon_base/favicon_types.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698