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