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 import("//build/buildflag_header.gni") | 5 import("//build/buildflag_header.gni") |
6 import("//build/config/ui.gni") | 6 import("//build/config/ui.gni") |
7 import("//device/vr/features/features.gni") | 7 import("//device/vr/features/features.gni") |
8 import("//ui/vector_icons/vector_icons.gni") | 8 import("//ui/vector_icons/vector_icons.gni") |
9 | 9 |
10 buildflag_header("build_features") { | 10 buildflag_header("build_features") { |
11 header = "features.h" | 11 header = "features.h" |
12 flags = [ "ENABLE_VR=$enable_vr" ] | 12 flags = [ "ENABLE_VR=$enable_vr" ] |
13 } | 13 } |
14 | 14 |
15 aggregate_vector_icons("toolbar_vector_icons") { | 15 aggregate_vector_icons("toolbar_vector_icons") { |
16 icon_directory = "vector_icons" | 16 icon_directory = "vector_icons" |
17 | 17 |
18 icons = [ | 18 icons = [ |
19 "http.1x.icon", | 19 "http.1x.icon", |
20 "http.icon", | 20 "http.icon", |
21 "https_invalid.1x.icon", | 21 "https_invalid.1x.icon", |
22 "https_invalid.icon", | 22 "https_invalid.icon", |
23 "https_valid.1x.icon", | 23 "https_valid.1x.icon", |
24 "https_valid.icon", | 24 "https_valid.icon", |
25 "https_valid_in_chip.1x.icon", | 25 "https_valid_in_chip.1x.icon", |
26 "https_valid_in_chip.icon", | 26 "https_valid_in_chip.icon", |
27 "offline_pin.icon", | |
Peter Kasting
2017/07/07 01:21:55
You should likely add distinct 1x and 2x versions,
cjgrant
2017/07/07 15:08:00
My understanding of 1x is that they're hand-tuned
cjgrant
2017/07/07 17:25:47
After talking to Terry, I still think this should
| |
27 "product.1x.icon", | 28 "product.1x.icon", |
28 "product.icon", | 29 "product.icon", |
29 "star_active.icon", | 30 "star_active.icon", |
30 "star.icon", | 31 "star.icon", |
31 ] | 32 ] |
32 } | 33 } |
33 | 34 |
34 static_library("vector_icons") { | 35 static_library("vector_icons") { |
35 sources = get_target_outputs(":toolbar_vector_icons") | 36 sources = get_target_outputs(":toolbar_vector_icons") |
36 deps = [ | 37 deps = [ |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
89 deps = [ | 90 deps = [ |
90 "//components/resources", | 91 "//components/resources", |
91 "//ui/gfx", | 92 "//ui/gfx", |
92 ] | 93 ] |
93 | 94 |
94 if (toolkit_views) { | 95 if (toolkit_views) { |
95 # Needed to get the TOOLKIT_VIEWS define. | 96 # Needed to get the TOOLKIT_VIEWS define. |
96 deps += [ "//ui/views" ] | 97 deps += [ "//ui/views" ] |
97 } | 98 } |
98 } | 99 } |
OLD | NEW |