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