| 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("//media/media_options.gni") | 9 import("//media/media_options.gni") |
| 10 import("//third_party/protobuf/proto_library.gni") | 10 import("//third_party/protobuf/proto_library.gni") |
| (...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 568 "//chrome") | 568 "//chrome") |
| 569 defines += [ "USE_LIBSECRET" ] | 569 defines += [ "USE_LIBSECRET" ] |
| 570 } | 570 } |
| 571 if (use_aura) { | 571 if (use_aura) { |
| 572 sources += | 572 sources += |
| 573 rebase_path(gypi_values.chrome_browser_aura_sources, ".", "//chrome") | 573 rebase_path(gypi_values.chrome_browser_aura_sources, ".", "//chrome") |
| 574 | 574 |
| 575 # These files are only built in a GN build because they bring in | 575 # These files are only built in a GN build because they bring in |
| 576 # dependencies that don't build with GYP. | 576 # dependencies that don't build with GYP. |
| 577 sources += [ | 577 sources += [ |
| 578 "mojo_runner_state.cc", | |
| 579 "mojo_runner_state.h", | |
| 580 "ui/views/frame/browser_frame_mus.cc", | 578 "ui/views/frame/browser_frame_mus.cc", |
| 581 "ui/views/frame/browser_frame_mus.h", | 579 "ui/views/frame/browser_frame_mus.h", |
| 582 ] | 580 ] |
| 583 deps += [ | 581 deps += [ |
| 584 "//components/mus/public/interfaces", | 582 "//content/public/common", |
| 585 "//mojo/runner/child:lib", | 583 "//mojo/runner/child:lib", |
| 586 "//mojo/converters/network", | |
| 587 "//ui/aura", | 584 "//ui/aura", |
| 588 "//ui/compositor", | 585 "//ui/compositor", |
| 589 "//ui/keyboard", | 586 "//ui/keyboard", |
| 590 "//ui/keyboard:keyboard_with_content", | 587 "//ui/keyboard:keyboard_with_content", |
| 591 "//ui/views/mus", | 588 "//ui/views/mus:for_component", |
| 592 ] | 589 ] |
| 593 defines += [ "MOJO_RUNNER_CLIENT" ] | 590 defines += [ "MOJO_SHELL_CLIENT" ] |
| 594 data_deps += [ "//components/mus/example/wm:example_wm" ] | 591 data_deps += [ "//components/mus/example/wm:example_wm" ] |
| 595 } | 592 } |
| 596 if (ui_compositor_image_transport) { | 593 if (ui_compositor_image_transport) { |
| 597 deps += [ "//ui/gl" ] | 594 deps += [ "//ui/gl" ] |
| 598 } | 595 } |
| 599 | 596 |
| 600 if (use_ash) { | 597 if (use_ash) { |
| 601 sources += | 598 sources += |
| 602 rebase_path(gypi_values.chrome_browser_ash_sources, ".", "//chrome") | 599 rebase_path(gypi_values.chrome_browser_ash_sources, ".", "//chrome") |
| 603 } | 600 } |
| (...skipping 661 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1265 rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome") | 1262 rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome") |
| 1266 deps = [ | 1263 deps = [ |
| 1267 "//components/google/core/browser", | 1264 "//components/google/core/browser", |
| 1268 "//components/omnibox/browser", | 1265 "//components/omnibox/browser", |
| 1269 "//components/rlz", | 1266 "//components/rlz", |
| 1270 "//components/search_engines", | 1267 "//components/search_engines", |
| 1271 "//rlz:rlz_lib", | 1268 "//rlz:rlz_lib", |
| 1272 ] | 1269 ] |
| 1273 } | 1270 } |
| 1274 } | 1271 } |
| OLD | NEW |