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