| 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/config/ui.gni") | 5 import("//build/config/ui.gni") |
| 6 import("//ui/vector_icons/vector_icons.gni") | 6 import("//ui/vector_icons/vector_icons.gni") |
| 7 | 7 |
| 8 aggregate_vector_icons("toolbar_vector_icons") { | 8 aggregate_vector_icons("toolbar_vector_icons") { |
| 9 icon_directory = "vector_icons" | 9 icon_directory = "vector_icons" |
| 10 | 10 |
| 11 icons = [ | 11 icons = [ |
| 12 # TODO(estade): this is the same as ui/gfx/vector_icons/business.icon. Use | |
| 13 # that one instead once it's been updated from VectorIconId to VectorIcon. | |
| 14 "business.icon", | |
| 15 "http.1x.icon", | 12 "http.1x.icon", |
| 16 "http.icon", | 13 "http.icon", |
| 17 "https_invalid.1x.icon", | 14 "https_invalid.1x.icon", |
| 18 "https_invalid.icon", | 15 "https_invalid.icon", |
| 19 "https_valid.1x.icon", | 16 "https_valid.1x.icon", |
| 20 "https_valid.icon", | 17 "https_valid.icon", |
| 21 "https_valid_in_chip.1x.icon", | 18 "https_valid_in_chip.1x.icon", |
| 22 "https_valid_in_chip.icon", | 19 "https_valid_in_chip.icon", |
| 23 "product.1x.icon", | 20 "product.1x.icon", |
| 24 "product.icon", | 21 "product.icon", |
| (...skipping 19 matching lines...) Expand all Loading... |
| 44 "//components/strings", | 41 "//components/strings", |
| 45 "//components/url_formatter", | 42 "//components/url_formatter", |
| 46 "//net", | 43 "//net", |
| 47 "//ui/base", | 44 "//ui/base", |
| 48 "//ui/gfx", | 45 "//ui/gfx", |
| 49 "//url", | 46 "//url", |
| 50 ] | 47 ] |
| 51 | 48 |
| 52 if (!is_android && !is_ios) { | 49 if (!is_android && !is_ios) { |
| 53 sources += get_target_outputs(":toolbar_vector_icons") | 50 sources += get_target_outputs(":toolbar_vector_icons") |
| 54 deps += [ ":toolbar_vector_icons" ] | 51 deps += [ |
| 52 ":toolbar_vector_icons", |
| 53 "//ui/vector_icons", |
| 54 ] |
| 55 } | 55 } |
| 56 } | 56 } |
| 57 | 57 |
| 58 static_library("test_support") { | 58 static_library("test_support") { |
| 59 testonly = true | 59 testonly = true |
| 60 | 60 |
| 61 sources = [ | 61 sources = [ |
| 62 "test_toolbar_model.cc", | 62 "test_toolbar_model.cc", |
| 63 "test_toolbar_model.h", | 63 "test_toolbar_model.h", |
| 64 ] | 64 ] |
| 65 | 65 |
| 66 deps = [ | 66 deps = [ |
| 67 ":toolbar", | 67 ":toolbar", |
| 68 "//base", | 68 "//base", |
| 69 "//components/resources", | 69 "//components/resources", |
| 70 "//ui/gfx", | 70 "//ui/gfx", |
| 71 ] | 71 ] |
| 72 | 72 |
| 73 if (toolkit_views) { | 73 if (toolkit_views) { |
| 74 # Needed to get the TOOLKIT_VIEWS define. | 74 # Needed to get the TOOLKIT_VIEWS define. |
| 75 deps += [ "//ui/views" ] | 75 deps += [ "//ui/views" ] |
| 76 } | 76 } |
| 77 } | 77 } |
| OLD | NEW |