| 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 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 318 if (!is_mac) { | 318 if (!is_mac) { |
| 319 sources += | 319 sources += |
| 320 rebase_path(gypi_values.chrome_browser_ui_views_non_mac_sources, | 320 rebase_path(gypi_values.chrome_browser_ui_views_non_mac_sources, |
| 321 ".", | 321 ".", |
| 322 "//chrome") | 322 "//chrome") |
| 323 if (use_aura) { | 323 if (use_aura) { |
| 324 deps += [ | 324 deps += [ |
| 325 "//components/mus/public/cpp", | 325 "//components/mus/public/cpp", |
| 326 "//components/mus/public/interfaces", | 326 "//components/mus/public/interfaces", |
| 327 ] | 327 ] |
| 328 |
| 329 # TODO(erg): These files hard depend on mus, and thus can't be in a gyp |
| 330 # build. When gyp goes away, merge this back into the sources list. |
| 331 sources += [ |
| 332 "views/tabs/window_finder_mus.cc", |
| 333 "views/tabs/window_finder_mus.h", |
| 334 ] |
| 328 } | 335 } |
| 329 if (enable_extensions) { | 336 if (enable_extensions) { |
| 330 sources += rebase_path( | 337 sources += rebase_path( |
| 331 gypi_values.chrome_browser_ui_views_extensions_non_mac_sources, | 338 gypi_values.chrome_browser_ui_views_extensions_non_mac_sources, |
| 332 ".", | 339 ".", |
| 333 "//chrome") | 340 "//chrome") |
| 334 } | 341 } |
| 335 } | 342 } |
| 336 if (use_ash) { | 343 if (use_ash) { |
| 337 sources += rebase_path(gypi_values.chrome_browser_ui_ash_views_sources, | 344 sources += rebase_path(gypi_values.chrome_browser_ui_ash_views_sources, |
| (...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 710 "//chrome/browser", | 717 "//chrome/browser", |
| 711 "//content/public/browser", | 718 "//content/public/browser", |
| 712 "//content/public/common", | 719 "//content/public/common", |
| 713 "//content/test:test_support", | 720 "//content/test:test_support", |
| 714 "//net:test_support", | 721 "//net:test_support", |
| 715 "//skia", | 722 "//skia", |
| 716 "//testing/gtest", | 723 "//testing/gtest", |
| 717 "//ui/base", | 724 "//ui/base", |
| 718 ] | 725 ] |
| 719 } | 726 } |
| OLD | NEW |