| 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 | 8 |
| 9 gypi_values = exec_script("//build/gypi_to_gn.py", | 9 gypi_values = exec_script("//build/gypi_to_gn.py", |
| 10 [ rebase_path("../../chrome_browser_ui.gypi") ], | 10 [ rebase_path("../../chrome_browser_ui.gypi") ], |
| (...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 262 | 262 |
| 263 # gtk2 is the only component that can interact with gtk2 in our new | 263 # gtk2 is the only component that can interact with gtk2 in our new |
| 264 # world. | 264 # world. |
| 265 "//chrome/browser/ui/libgtk2ui", | 265 "//chrome/browser/ui/libgtk2ui", |
| 266 ] | 266 ] |
| 267 } | 267 } |
| 268 if (is_win || is_mac || is_desktop_linux) { | 268 if (is_win || is_mac || is_desktop_linux) { |
| 269 sources += rebase_path(gypi_values.chrome_browser_ui_desktop_sources, | 269 sources += rebase_path(gypi_values.chrome_browser_ui_desktop_sources, |
| 270 ".", | 270 ".", |
| 271 "//chrome") | 271 "//chrome") |
| 272 if (is_mac && !mac_views_browser) { |
| 273 sources -= [ |
| 274 # This is not explicitly excluded in GYP, but I think the static |
| 275 # library linking rules means it's never referenced when compiling in |
| 276 # non-Views mode on Mac. It appears not to link in that case. |
| 277 "views/profiles/new_avatar_button.cc", |
| 278 "views/profiles/new_avatar_button.h", |
| 279 ] |
| 280 } |
| 272 } | 281 } |
| 273 if (use_aura) { | 282 if (use_aura) { |
| 274 sources += | 283 sources += |
| 275 rebase_path(gypi_values.chrome_browser_ui_aura_sources, ".", "//chrome") | 284 rebase_path(gypi_values.chrome_browser_ui_aura_sources, ".", "//chrome") |
| 276 deps += [ | 285 deps += [ |
| 277 # aura uses some of ash resources. | 286 # aura uses some of ash resources. |
| 278 "//ash/resources", | 287 "//ash/resources", |
| 279 "//ui/aura", | 288 "//ui/aura", |
| 280 "//ui/keyboard", | 289 "//ui/keyboard", |
| 281 "//ui/keyboard:keyboard_with_content", | 290 "//ui/keyboard:keyboard_with_content", |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 464 if (enable_google_now && !is_android) { | 473 if (enable_google_now && !is_android) { |
| 465 sources += rebase_path( | 474 sources += rebase_path( |
| 466 gypi_values.chrome_browser_ui_google_now_non_android_sources, | 475 gypi_values.chrome_browser_ui_google_now_non_android_sources, |
| 467 ".", | 476 ".", |
| 468 "//chrome") | 477 "//chrome") |
| 469 } | 478 } |
| 470 if (enable_media_router && !is_android && !is_ios) { | 479 if (enable_media_router && !is_android && !is_ios) { |
| 471 sources += rebase_path(gypi_values.chrome_browser_ui_media_router_sources, | 480 sources += rebase_path(gypi_values.chrome_browser_ui_media_router_sources, |
| 472 ".", | 481 ".", |
| 473 "//chrome") | 482 "//chrome") |
| 483 if (is_mac && !mac_views_browser) { |
| 484 sources -= [ |
| 485 # This file is compiled on GYP but never referenced on Mac. Since it's |
| 486 # in a static library, it never gets pulled in and we never try to link |
| 487 # it (it doesn't link). In GN, source sets force us to get this rule |
| 488 # correct. |
| 489 "views/toolbar/media_router_action_platform_delegate_views.cc", |
| 490 "views/toolbar/media_router_action_platform_delegate_views.h", |
| 491 ] |
| 492 } |
| 474 deps += [ "//chrome/browser/media/router" ] | 493 deps += [ "//chrome/browser/media/router" ] |
| 475 } | 494 } |
| 476 if (enable_webrtc) { | 495 if (enable_webrtc) { |
| 477 sources += rebase_path(gypi_values.chrome_browser_ui_webrtc_sources, | 496 sources += rebase_path(gypi_values.chrome_browser_ui_webrtc_sources, |
| 478 ".", | 497 ".", |
| 479 "//chrome") | 498 "//chrome") |
| 480 } | 499 } |
| 481 if (enable_service_discovery) { | 500 if (enable_service_discovery) { |
| 482 sources += | 501 sources += |
| 483 rebase_path(gypi_values.chrome_browser_ui_service_discovery_sources, | 502 rebase_path(gypi_values.chrome_browser_ui_service_discovery_sources, |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 532 "toolbar/test_toolbar_action_view_controller.h", | 551 "toolbar/test_toolbar_action_view_controller.h", |
| 533 ] | 552 ] |
| 534 | 553 |
| 535 if (!is_ios && !is_android) { | 554 if (!is_ios && !is_android) { |
| 536 sources += [ | 555 sources += [ |
| 537 "website_settings/mock_permission_bubble_request.cc", | 556 "website_settings/mock_permission_bubble_request.cc", |
| 538 "website_settings/mock_permission_bubble_request.h", | 557 "website_settings/mock_permission_bubble_request.h", |
| 539 ] | 558 ] |
| 540 } | 559 } |
| 541 | 560 |
| 542 if (toolkit_views) { | 561 if (toolkit_views && (!is_mac || mac_views_browser)) { |
| 543 sources += [ "views/find_bar_host_unittest_util_views.cc" ] | 562 sources += [ |
| 544 if (!is_mac) { | 563 "views/find_bar_host_unittest_util_views.cc", |
| 545 sources += [ "views/toolbar/browser_action_test_util_views.cc" ] | 564 "views/toolbar/browser_action_test_util_views.cc", |
| 546 } | 565 ] |
| 547 } | 566 } |
| 548 | 567 |
| 549 if (is_android) { | 568 if (is_android) { |
| 550 sources -= [ | 569 sources -= [ |
| 551 "exclusive_access/fullscreen_controller_state_test.cc", | 570 "exclusive_access/fullscreen_controller_state_test.cc", |
| 552 "exclusive_access/fullscreen_controller_state_test.h", | 571 "exclusive_access/fullscreen_controller_state_test.h", |
| 553 "exclusive_access/fullscreen_controller_state_tests.h", | 572 "exclusive_access/fullscreen_controller_state_tests.h", |
| 554 "exclusive_access/fullscreen_controller_test.cc", | 573 "exclusive_access/fullscreen_controller_test.cc", |
| 555 "exclusive_access/fullscreen_controller_test.h", | 574 "exclusive_access/fullscreen_controller_test.h", |
| 556 "test/test_confirm_bubble_model.cc", | 575 "test/test_confirm_bubble_model.cc", |
| 557 "test/test_confirm_bubble_model.h", | 576 "test/test_confirm_bubble_model.h", |
| 558 ] | 577 ] |
| 559 } | 578 } |
| 560 | 579 |
| 561 public_deps = [ | 580 public_deps = [ |
| 562 ":ui", | 581 ":ui", |
| 563 ] | 582 ] |
| 564 deps = [ | 583 deps = [ |
| 565 "//chrome/app/theme:theme_resources", | 584 "//chrome/app/theme:theme_resources", |
| 566 "//chrome/browser", | 585 "//chrome/browser", |
| 567 "//content/public/browser", | 586 "//content/public/browser", |
| 568 "//content/public/common", | 587 "//content/public/common", |
| 569 "//content/test:test_support", | 588 "//content/test:test_support", |
| 570 "//net:test_support", | 589 "//net:test_support", |
| 571 "//skia", | 590 "//skia", |
| 572 "//testing/gtest", | 591 "//testing/gtest", |
| 573 "//ui/base", | 592 "//ui/base", |
| 574 ] | 593 ] |
| 575 } | 594 } |
| OLD | NEW |