| 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 329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 340 sources += rebase_path(gypi_values.chrome_browser_ui_ash_views_sources, | 340 sources += rebase_path(gypi_values.chrome_browser_ui_ash_views_sources, |
| 341 ".", | 341 ".", |
| 342 "//chrome") | 342 "//chrome") |
| 343 } | 343 } |
| 344 } else { | 344 } else { |
| 345 # !toolkit_views | 345 # !toolkit_views |
| 346 if (!is_ios) { | 346 if (!is_ios) { |
| 347 deps -= [ "//chrome/browser/ui/views" ] | 347 deps -= [ "//chrome/browser/ui/views" ] |
| 348 } | 348 } |
| 349 } | 349 } |
| 350 if (use_gio) { |
| 351 deps += [ "//build/linux/libgio" ] |
| 352 } |
| 350 if (use_aura && !use_ozone && is_desktop_linux) { | 353 if (use_aura && !use_ozone && is_desktop_linux) { |
| 351 deps += [ | 354 deps += [ |
| 352 "//build/linux/libgio", | |
| 353 | |
| 354 # gtk2 is the only component that can interact with gtk2 in our new | 355 # gtk2 is the only component that can interact with gtk2 in our new |
| 355 # world. | 356 # world. |
| 356 "//chrome/browser/ui/libgtk2ui", | 357 "//chrome/browser/ui/libgtk2ui", |
| 357 ] | 358 ] |
| 358 } | 359 } |
| 359 if (is_win || is_mac || is_desktop_linux) { | 360 if (is_win || is_mac || is_desktop_linux) { |
| 360 sources += rebase_path(gypi_values.chrome_browser_ui_desktop_sources, | 361 sources += rebase_path(gypi_values.chrome_browser_ui_desktop_sources, |
| 361 ".", | 362 ".", |
| 362 "//chrome") | 363 "//chrome") |
| 363 if (is_mac && !mac_views_browser) { | 364 if (is_mac && !mac_views_browser) { |
| (...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 709 "//chrome/browser", | 710 "//chrome/browser", |
| 710 "//content/public/browser", | 711 "//content/public/browser", |
| 711 "//content/public/common", | 712 "//content/public/common", |
| 712 "//content/test:test_support", | 713 "//content/test:test_support", |
| 713 "//net:test_support", | 714 "//net:test_support", |
| 714 "//skia", | 715 "//skia", |
| 715 "//testing/gtest", | 716 "//testing/gtest", |
| 716 "//ui/base", | 717 "//ui/base", |
| 717 ] | 718 ] |
| 718 } | 719 } |
| OLD | NEW |