| 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/chrome_build.gni") | 5 import("//build/config/chrome_build.gni") |
| 6 import("//build/config/crypto.gni") | 6 import("//build/config/crypto.gni") |
| 7 import("//build/config/features.gni") | 7 import("//build/config/features.gni") |
| 8 import("//build/config/ui.gni") | 8 import("//build/config/ui.gni") |
| 9 import("//chrome/common/features.gni") | 9 import("//chrome/common/features.gni") |
| 10 import("//media/media_options.gni") | 10 import("//media/media_options.gni") |
| (...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 591 defines += [ "USE_LIBSECRET" ] | 591 defines += [ "USE_LIBSECRET" ] |
| 592 deps += [ "//third_party/libsecret" ] | 592 deps += [ "//third_party/libsecret" ] |
| 593 } | 593 } |
| 594 if (use_aura) { | 594 if (use_aura) { |
| 595 sources += | 595 sources += |
| 596 rebase_path(gypi_values.chrome_browser_aura_sources, ".", "//chrome") | 596 rebase_path(gypi_values.chrome_browser_aura_sources, ".", "//chrome") |
| 597 | 597 |
| 598 # These files are only built in a GN build because they bring in | 598 # These files are only built in a GN build because they bring in |
| 599 # dependencies that don't build with GYP. | 599 # dependencies that don't build with GYP. |
| 600 sources += [ | 600 sources += [ |
| 601 "ui/ash/launcher/chrome_mash_shelf_controller.cc", | |
| 602 "ui/ash/launcher/chrome_mash_shelf_controller.h", | |
| 603 "ui/views/frame/browser_frame_mus.cc", | 601 "ui/views/frame/browser_frame_mus.cc", |
| 604 "ui/views/frame/browser_frame_mus.h", | 602 "ui/views/frame/browser_frame_mus.h", |
| 605 "ui/views/frame/browser_non_client_frame_view_mus.cc", | 603 "ui/views/frame/browser_non_client_frame_view_mus.cc", |
| 606 "ui/views/frame/browser_non_client_frame_view_mus.h", | 604 "ui/views/frame/browser_non_client_frame_view_mus.h", |
| 607 ] | 605 ] |
| 608 deps += [ | 606 deps += [ |
| 609 "//components/mus/public/cpp", | 607 "//components/mus/public/cpp", |
| 610 "//components/prefs", | |
| 611 "//content/public/common", | 608 "//content/public/common", |
| 612 "//mash/shelf/public/interfaces", | |
| 613 "//services/shell/runner/common", | |
| 614 "//skia/public", | |
| 615 "//ui/aura", | 609 "//ui/aura", |
| 616 "//ui/compositor", | 610 "//ui/compositor", |
| 617 "//ui/keyboard", | |
| 618 "//ui/keyboard:keyboard_with_content", | |
| 619 "//ui/views/mus:for_component", | 611 "//ui/views/mus:for_component", |
| 620 ] | 612 ] |
| 621 defines += [ "MOJO_SHELL_CLIENT" ] | 613 defines += [ "MOJO_SHELL_CLIENT" ] |
| 622 data_deps += [ "//mash/wm" ] | 614 data_deps += [ "//mash/wm" ] |
| 623 } | 615 } |
| 624 if (ui_compositor_image_transport) { | 616 if (ui_compositor_image_transport) { |
| 625 deps += [ "//ui/gl" ] | 617 deps += [ "//ui/gl" ] |
| 626 } | 618 } |
| 627 | 619 |
| 628 if (use_ash) { | 620 if (use_ash) { |
| (...skipping 715 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1344 rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome") | 1336 rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome") |
| 1345 deps = [ | 1337 deps = [ |
| 1346 "//components/google/core/browser", | 1338 "//components/google/core/browser", |
| 1347 "//components/omnibox/browser", | 1339 "//components/omnibox/browser", |
| 1348 "//components/rlz", | 1340 "//components/rlz", |
| 1349 "//components/search_engines", | 1341 "//components/search_engines", |
| 1350 "//rlz:rlz_lib", | 1342 "//rlz:rlz_lib", |
| 1351 ] | 1343 ] |
| 1352 } | 1344 } |
| 1353 } | 1345 } |
| OLD | NEW |