| 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 413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 424 ".", | 424 ".", |
| 425 "//chrome") | 425 "//chrome") |
| 426 sources += | 426 sources += |
| 427 rebase_path(gypi_values.chrome_browser_ui_views_non_mac_sources, | 427 rebase_path(gypi_values.chrome_browser_ui_views_non_mac_sources, |
| 428 ".", | 428 ".", |
| 429 "//chrome") | 429 "//chrome") |
| 430 sources += rebase_path( | 430 sources += rebase_path( |
| 431 gypi_values.chrome_browser_ui_views_extensions_non_mac_sources, | 431 gypi_values.chrome_browser_ui_views_extensions_non_mac_sources, |
| 432 ".", | 432 ".", |
| 433 "//chrome") | 433 "//chrome") |
| 434 |
| 435 sources -= [ |
| 436 "views/extensions/extension_popup_aura.cc", |
| 437 "views/extensions/extension_popup_aura.h", |
| 438 ] |
| 439 |
| 434 deps += [ "//extensions/components/native_app_window" ] | 440 deps += [ "//extensions/components/native_app_window" ] |
| 435 } else { | 441 } else { |
| 436 sources += rebase_path(gypi_values.chrome_browser_ui_cocoa_sources, | 442 sources += rebase_path(gypi_values.chrome_browser_ui_cocoa_sources, |
| 437 ".", | 443 ".", |
| 438 "//chrome") | 444 "//chrome") |
| 439 } | 445 } |
| 440 include_dirs = [ "$target_gen_dir" ] | 446 include_dirs = [ "$target_gen_dir" ] |
| 441 libs += [ | 447 libs += [ |
| 442 "Carbon.framework", | 448 "Carbon.framework", |
| 443 "Quartz.framework", | 449 "Quartz.framework", |
| (...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 685 "//chrome/browser", | 691 "//chrome/browser", |
| 686 "//content/public/browser", | 692 "//content/public/browser", |
| 687 "//content/public/common", | 693 "//content/public/common", |
| 688 "//content/test:test_support", | 694 "//content/test:test_support", |
| 689 "//net:test_support", | 695 "//net:test_support", |
| 690 "//skia", | 696 "//skia", |
| 691 "//testing/gtest", | 697 "//testing/gtest", |
| 692 "//ui/base", | 698 "//ui/base", |
| 693 ] | 699 ] |
| 694 } | 700 } |
| OLD | NEW |