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/crypto.gni") | 5 import("//build/config/crypto.gni") |
6 import("//build/config/features.gni") | 6 import("//build/config/features.gni") |
7 import("//build/config/ui.gni") | 7 import("//build/config/ui.gni") |
8 import("//chrome/common/features.gni") | 8 import("//chrome/common/features.gni") |
9 | 9 |
10 gypi_values = exec_script("//build/gypi_to_gn.py", | 10 gypi_values = exec_script("//build/gypi_to_gn.py", |
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
218 ] | 218 ] |
219 } else { | 219 } else { |
220 defines += [ "FRAME_AVATAR_BUTTON=1" ] | 220 defines += [ "FRAME_AVATAR_BUTTON=1" ] |
221 } | 221 } |
222 if (use_cups) { | 222 if (use_cups) { |
223 configs += [ "//printing:cups" ] | 223 configs += [ "//printing:cups" ] |
224 } | 224 } |
225 if (use_ash) { | 225 if (use_ash) { |
226 sources += | 226 sources += |
227 rebase_path(gypi_values.chrome_browser_ui_ash_sources, ".", "//chrome") | 227 rebase_path(gypi_values.chrome_browser_ui_ash_sources, ".", "//chrome") |
| 228 sources += [ |
| 229 "ash/keyboard_ui_service.cc", |
| 230 "ash/keyboard_ui_service.h", |
| 231 ] |
228 deps += [ | 232 deps += [ |
229 "//ash", | 233 "//ash", |
230 "//ash:ash_with_content", | 234 "//ash:ash_with_content", |
231 "//ash/strings", | 235 "//ash/strings", |
232 "//components/user_manager", | 236 "//components/user_manager", |
| 237 "//ui/keyboard:mojom", |
233 ] | 238 ] |
234 if (!is_chromeos) { | 239 if (!is_chromeos) { |
235 sources += rebase_path(gypi_values.chrome_browser_ui_ash_non_chromeos, | 240 sources += rebase_path(gypi_values.chrome_browser_ui_ash_non_chromeos, |
236 ".", | 241 ".", |
237 "//chrome") | 242 "//chrome") |
238 } | 243 } |
239 } else { # Not ash. | 244 } else { # Not ash. |
240 sources += rebase_path(gypi_values.chrome_browser_ui_non_ash_sources, | 245 sources += rebase_path(gypi_values.chrome_browser_ui_non_ash_sources, |
241 ".", | 246 ".", |
242 "//chrome") | 247 "//chrome") |
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
628 "//chrome/browser", | 633 "//chrome/browser", |
629 "//content/public/browser", | 634 "//content/public/browser", |
630 "//content/public/common", | 635 "//content/public/common", |
631 "//content/test:test_support", | 636 "//content/test:test_support", |
632 "//net:test_support", | 637 "//net:test_support", |
633 "//skia", | 638 "//skia", |
634 "//testing/gtest", | 639 "//testing/gtest", |
635 "//ui/base", | 640 "//ui/base", |
636 ] | 641 ] |
637 } | 642 } |
OLD | NEW |