| 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 447 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 458 "//ui/views", | 458 "//ui/views", |
| 459 "//ui/views/controls/webview", | 459 "//ui/views/controls/webview", |
| 460 ] | 460 ] |
| 461 deps += [ | 461 deps += [ |
| 462 "//chrome/installer/util:strings", | 462 "//chrome/installer/util:strings", |
| 463 "//components/search_engines", | 463 "//components/search_engines", |
| 464 "//google_update", | 464 "//google_update", |
| 465 "//third_party/iaccessible2", | 465 "//third_party/iaccessible2", |
| 466 "//third_party/isimpledom", | 466 "//third_party/isimpledom", |
| 467 "//third_party/wtl", | 467 "//third_party/wtl", |
| 468 "//ui/app_list", | |
| 469 "//ui/base/ime", | 468 "//ui/base/ime", |
| 470 "//ui/events:dom_keycode_converter", | 469 "//ui/events:dom_keycode_converter", |
| 471 ] | 470 ] |
| 472 if (!is_chrome_branded) { | 471 if (!is_chrome_branded) { |
| 473 deps -= [ "//google_update" ] | 472 deps -= [ "//google_update" ] |
| 474 sources -= [ "webui/help/version_updater_win.cc" ] | 473 sources -= [ "webui/help/version_updater_win.cc" ] |
| 475 sources += [ | 474 sources += [ |
| 476 "webui/help/version_updater_basic.cc", | 475 "webui/help/version_updater_basic.cc", |
| 477 "webui/help/version_updater_basic.h", | 476 "webui/help/version_updater_basic.h", |
| 478 ] | 477 ] |
| 479 } | 478 } |
| 479 if (enable_app_list) { |
| 480 deps += [ "//ui/app_list" ] |
| 481 } |
| 480 } else { # 'OS!="win" | 482 } else { # 'OS!="win" |
| 481 if (toolkit_views) { | 483 if (toolkit_views) { |
| 482 public_deps += [ | 484 public_deps += [ |
| 483 "//ui/views", | 485 "//ui/views", |
| 484 "//ui/views/controls/webview", | 486 "//ui/views/controls/webview", |
| 485 ] | 487 ] |
| 486 } | 488 } |
| 487 } | 489 } |
| 488 if (is_desktop_linux) { | 490 if (is_desktop_linux) { |
| 489 sources += rebase_path(gypi_values.chrome_browser_ui_desktop_linux_sources, | 491 sources += rebase_path(gypi_values.chrome_browser_ui_desktop_linux_sources, |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 522 | 524 |
| 523 if (enable_app_list) { | 525 if (enable_app_list) { |
| 524 sources += rebase_path(gypi_values.chrome_browser_ui_app_list_sources, | 526 sources += rebase_path(gypi_values.chrome_browser_ui_app_list_sources, |
| 525 ".", | 527 ".", |
| 526 "//chrome") | 528 "//chrome") |
| 527 if (is_chromeos) { | 529 if (is_chromeos) { |
| 528 sources += rebase_path(gypi_values.chrome_browser_ui_chromeos_arc_sources, | 530 sources += rebase_path(gypi_values.chrome_browser_ui_chromeos_arc_sources, |
| 529 ".", | 531 ".", |
| 530 "//chrome") | 532 "//chrome") |
| 531 } | 533 } |
| 534 if (is_desktop_linux) { |
| 535 sources += |
| 536 rebase_path(gypi_values.chrome_browser_ui_app_list_linux_sources, |
| 537 ".", |
| 538 "//chrome") |
| 539 } |
| 532 if (!is_mac && !use_ash) { | 540 if (!is_mac && !use_ash) { |
| 533 sources += | 541 sources += |
| 534 rebase_path(gypi_values.chrome_browser_ui_app_list_views_sources, | 542 rebase_path(gypi_values.chrome_browser_ui_app_list_views_sources, |
| 535 ".", | 543 ".", |
| 536 "//chrome") | 544 "//chrome") |
| 537 } | 545 } |
| 538 deps += [ "//ui/app_list" ] | 546 deps += [ "//ui/app_list" ] |
| 539 } else { | 547 } else { |
| 540 sources += rebase_path(gypi_values.chrome_browser_ui_non_app_list_sources, | 548 sources += rebase_path(gypi_values.chrome_browser_ui_non_app_list_sources, |
| 541 ".", | 549 ".", |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 677 "//chrome/browser", | 685 "//chrome/browser", |
| 678 "//content/public/browser", | 686 "//content/public/browser", |
| 679 "//content/public/common", | 687 "//content/public/common", |
| 680 "//content/test:test_support", | 688 "//content/test:test_support", |
| 681 "//net:test_support", | 689 "//net:test_support", |
| 682 "//skia", | 690 "//skia", |
| 683 "//testing/gtest", | 691 "//testing/gtest", |
| 684 "//ui/base", | 692 "//ui/base", |
| 685 ] | 693 ] |
| 686 } | 694 } |
| OLD | NEW |