OLD | NEW |
---|---|
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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/chrome_build.gni") | 5 import("//build/config/chrome_build.gni") |
6 import("//build/config/compiler/compiler.gni") | 6 import("//build/config/compiler/compiler.gni") |
7 import("//build/config/crypto.gni") | 7 import("//build/config/crypto.gni") |
8 import("//build/config/features.gni") | 8 import("//build/config/features.gni") |
9 import("//build/config/ui.gni") | 9 import("//build/config/ui.gni") |
10 import("//chrome/common/features.gni") | 10 import("//chrome/common/features.gni") |
(...skipping 1023 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1034 "data/webui/settings/cr_settings_browsertest.js", | 1034 "data/webui/settings/cr_settings_browsertest.js", |
1035 "data/webui/settings/help_page_browsertest.js", | 1035 "data/webui/settings/help_page_browsertest.js", |
1036 "data/webui/settings/languages_page_browsertest.js", | 1036 "data/webui/settings/languages_page_browsertest.js", |
1037 "data/webui/settings/on_startup_browsertest.js", | 1037 "data/webui/settings/on_startup_browsertest.js", |
1038 "data/webui/settings/passwords_and_autofill_fake_data.js", | 1038 "data/webui/settings/passwords_and_autofill_fake_data.js", |
1039 "data/webui/settings/passwords_and_forms_browsertest.js", | 1039 "data/webui/settings/passwords_and_forms_browsertest.js", |
1040 "data/webui/settings/settings_autofill_section_browsertest.js", | 1040 "data/webui/settings/settings_autofill_section_browsertest.js", |
1041 "data/webui/settings/settings_idle_load_browsertest.js", | 1041 "data/webui/settings/settings_idle_load_browsertest.js", |
1042 "data/webui/settings/settings_page_browsertest.js", | 1042 "data/webui/settings/settings_page_browsertest.js", |
1043 "data/webui/settings/settings_passwords_section_browsertest.js", | 1043 "data/webui/settings/settings_passwords_section_browsertest.js", |
1044 "data/webui/settings/settings_subpage_browsertest.js", | |
dpapad
2017/05/01 21:02:22
Need to resolve conflits with https://codereview.c
stevenjb
2017/05/01 23:42:58
Acknowledged.
| |
1045 "data/webui/settings/settings_ui_browsertest.js", | 1044 "data/webui/settings/settings_ui_browsertest.js", |
1046 "data/webui/settings/site_settings_page_browsertest.js", | 1045 "data/webui/settings/site_settings_page_browsertest.js", |
1047 ] | 1046 ] |
1048 | 1047 |
1049 if (is_chromeos) { | 1048 if (is_chromeos) { |
1050 sources += [ "data/webui/settings/easy_unlock_browsertest_chromeos.js" ] | 1049 sources += [ "data/webui/settings/easy_unlock_browsertest_chromeos.js" ] |
1051 } | 1050 } |
1052 } | 1051 } |
1053 | 1052 |
1054 if (is_chrome_branded) { | 1053 if (is_chrome_branded) { |
(...skipping 4164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
5219 } | 5218 } |
5220 | 5219 |
5221 if (is_win) { | 5220 if (is_win) { |
5222 loadable_module("conflicts_dll") { | 5221 loadable_module("conflicts_dll") { |
5223 testonly = true | 5222 testonly = true |
5224 sources = [ | 5223 sources = [ |
5225 "conflicts/conflicts_dll.cc", | 5224 "conflicts/conflicts_dll.cc", |
5226 ] | 5225 ] |
5227 } | 5226 } |
5228 } | 5227 } |
OLD | NEW |